diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml deleted file mode 100644 index 68dbd50..0000000 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml deleted file mode 100644 index 68dbd50..0000000 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv_l.xml b/app/src/main/res/layout/item_search_result_rv_l.xml new file mode 100644 index 0000000..68dbd50 --- /dev/null +++ b/app/src/main/res/layout/item_search_result_rv_l.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml deleted file mode 100644 index 68dbd50..0000000 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv_l.xml b/app/src/main/res/layout/item_search_result_rv_l.xml new file mode 100644 index 0000000..68dbd50 --- /dev/null +++ b/app/src/main/res/layout/item_search_result_rv_l.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_sensor_list_rv.xml b/app/src/main/res/layout/item_sensor_list_rv.xml deleted file mode 100644 index a6419e0..0000000 --- a/app/src/main/res/layout/item_sensor_list_rv.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml deleted file mode 100644 index 68dbd50..0000000 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv_l.xml b/app/src/main/res/layout/item_search_result_rv_l.xml new file mode 100644 index 0000000..68dbd50 --- /dev/null +++ b/app/src/main/res/layout/item_search_result_rv_l.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_sensor_list_rv.xml b/app/src/main/res/layout/item_sensor_list_rv.xml deleted file mode 100644 index a6419e0..0000000 --- a/app/src/main/res/layout/item_sensor_list_rv.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_sensor_rv_l.xml b/app/src/main/res/layout/item_sensor_rv_l.xml new file mode 100644 index 0000000..ab630ca --- /dev/null +++ b/app/src/main/res/layout/item_sensor_rv_l.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c18c251..aa126fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 118 - versionName "1.1.8" + versionCode 115 + versionName "1.1.5" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt index 45c4d2f..52d1d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ExpandableViewAdapter.kt @@ -30,7 +30,7 @@ } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ExpandableItemViewHolder( - layoutInflater.inflate(R.layout.item_expand_view_rv, parent, false) + layoutInflater.inflate(R.layout.item_expand_view_rv_l, parent, false) ) override fun onBindViewHolder(holder: ExpandableItemViewHolder, position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index 15aad2e..c9d41de 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_completed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_completed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index c83a61f..514c437 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -20,11 +20,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_in_handle_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_in_handle_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -41,7 +40,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -80,14 +79,12 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) expandableList.add( ExpandableDataModel( - rowsBean.confirmJobTime, - String.format("${rowsBean.confirmJobPerson}确认工单") + rowsBean.confirmJobTime, String.format("${rowsBean.confirmJobPerson}确认工单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index afca205..8a172d5 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -19,11 +19,10 @@ private val dataRows: MutableList ) : RecyclerView.Adapter() { - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_confirmed_rv, parent, false) + LayoutInflater.from(context).inflate(R.layout.item_order_not_confirmed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size @@ -40,7 +39,7 @@ "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") @@ -74,8 +73,7 @@ expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( ExpandableDataModel( - rowsBean.getJobTime, - String.format("${rowsBean.getJobPerson}接单") + rowsBean.getJobTime, String.format("${rowsBean.getJobPerson}接单") ) ) return expandableList diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 9d416bb..9281da7 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -18,7 +18,7 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_not_processed_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_not_processed_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index a4493ef..a589060 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -26,7 +26,7 @@ private var isExpand = false override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_search_result_rv, parent, false) + layoutInflater.inflate(R.layout.item_search_result_rv_l, parent, false) ) override fun getItemCount(): Int = dataRows.size 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 deleted file mode 100644 index 750a52c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.app.smartwell.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WellMonitorModel -import com.pengxh.kt.lite.extensions.convertColor - -class SensorListAdapter( - private val context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_sensor_list_rv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") - if (rowsBean.onlineState == "0") { - holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) - } else { - holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) - } - holder.wellStateView.text = rowsBean.onlineStateName - - val value = if (rowsBean.data.toString().isBlank()) { - "未知" - } else { - rowsBean.data.toString() - } - holder.watchDataView.text = "${rowsBean.watchType}：$value" - 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 = "最新数据上报时间：未知" - } else { - holder.logTimeView.text = String.format("最新数据上报时间：$time") - } - } - - override fun getItemCount(): Int = dataRows.size - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) - var wellStateView: TextView = view.findViewById(R.id.wellStateView) - var watchDataView: TextView = view.findViewById(R.id.watchDataView) - var installDateView: TextView = view.findViewById(R.id.installDateView) - var logTimeView: TextView = view.findViewById(R.id.logTimeView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt new file mode 100644 index 0000000..629c41a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorRecyclerViewAdapter.kt @@ -0,0 +1,61 @@ +package com.casic.app.smartwell.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.casic.app.smartwell.R +import com.casic.app.smartwell.model.WellMonitorModel +import com.pengxh.kt.lite.extensions.convertColor + +class SensorRecyclerViewAdapter( + private val context: Context, private val dataRows: MutableList +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + LayoutInflater.from(context).inflate(R.layout.item_sensor_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") + if (rowsBean.onlineState == "0") { + holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) + } else { + holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) + } + holder.wellStateView.text = rowsBean.onlineStateName + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" + } else { + rowsBean.data.toString() + } + holder.watchDataView.text = "${rowsBean.watchType}：$value" + 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 = "数据更新时间：未知" + } else { + holder.logTimeView.text = String.format("数据更新时间：$time") + } + } + + override fun getItemCount(): Int = dataRows.size + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) + var wellStateView: TextView = view.findViewById(R.id.wellStateView) + var watchDataView: TextView = view.findViewById(R.id.watchDataView) + var installDateView: TextView = view.findViewById(R.id.installDateView) + var logTimeView: TextView = view.findViewById(R.id.logTimeView) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt index 3fac1f8..c0020f3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -1,18 +1,22 @@ package com.casic.app.smartwell.adapter +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter class TopViewPagerAdapter( fragmentManager: FragmentManager, - private val pageTitles: Array, - private val pages: List -) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + private val pageTitles: Array, private val pages: List +) : FragmentPagerAdapter(fragmentManager) { override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size override fun getPageTitle(position: Int) = pageTitles[position] + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + //注释掉父类方法，一直不销毁Fragment + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt index 0ec8647..097dd36 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt @@ -211,7 +211,7 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder @@ -219,7 +219,7 @@ .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt index b25f743..2196a76 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt @@ -204,14 +204,14 @@ //首页功能块 val homeRecycleAdapter = object : NormalRecyclerAdapter( - R.layout.item_home_page_rv, LocaleConstant.HOME_ITEMS.toMutableList() + R.layout.item_home_page_rv_g, LocaleConstant.HOME_ITEMS.toMutableList() ) { override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { viewHolder.setImageResource(R.id.imageView, LocaleConstant.HOME_ICONS[position]) .setText(R.id.textView, item) } } - binding.homeRecyclerView.adapter = homeRecycleAdapter + binding.recyclerView.adapter = homeRecycleAdapter homeRecycleAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: String) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index dcb48f8..3b23bbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.FileProvider @@ -290,6 +291,7 @@ * http://111.198.10.15:11304/static/apk/1.0.1.apk * */ val downloadPath = appendDownloadUrl() + Log.d(kTag, "downloadApk: $downloadPath") //开始下载 FileDownloadManager.Builder() .setDownloadFileSource(downloadPath) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt index 3c93f54..98b7e9c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt @@ -176,7 +176,7 @@ }) } } - binding.noticeRecyclerView.adapter = noticeDataAdapter + binding.recyclerView.adapter = noticeDataAdapter } } return true diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index baa3977..9a4326f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -50,7 +50,7 @@ when { isRefresh -> { completedAdapter.setRefreshData(dataRows!!) - binding.completedOrderLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -59,7 +59,7 @@ "到底了，别拉了".show(requireContext()) } completedAdapter.setLoadMoreData(dataRows!!) - binding.completedOrderLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -84,8 +84,8 @@ } } - binding.completedOrderView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -94,13 +94,13 @@ } override fun initEvent() { - binding.completedOrderLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.completedOrderLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -121,7 +121,7 @@ } else { binding.emptyInclude.emptyView.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - binding.completedOrderView.adapter = completedAdapter + binding.recyclerView.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 8e1dc28..0305ce9 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { inHandleAdapter.setRefreshData(dataRows!!) - binding.inHandleLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } inHandleAdapter.setLoadMoreData(dataRows!!) - binding.inHandleLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -83,8 +83,8 @@ } } - binding.inHandleView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -93,13 +93,13 @@ } override fun initEvent() { - binding.inHandleLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.inHandleLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -120,7 +120,7 @@ } else { binding.emptyInclude.emptyView.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - binding.inHandleView.adapter = inHandleAdapter + binding.recyclerView.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 5e38acb..daf3ca8 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -16,13 +16,13 @@ class OrderListFragment : KotlinBaseFragment() { - private var fragmentList = ArrayList() + private var fragmentPages = ArrayList() init { - fragmentList.add(OrderNotProcessedFragment()) - fragmentList.add(OrderNotConfirmedFragment()) - fragmentList.add(OrderInHandleFragment()) - fragmentList.add(OrderCompletedFragment()) + fragmentPages.add(OrderNotProcessedFragment()) + fragmentPages.add(OrderNotConfirmedFragment()) + fragmentPages.add(OrderInHandleFragment()) + fragmentPages.add(OrderCompletedFragment()) } override fun initViewBinding( @@ -46,12 +46,11 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( - childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList + childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentPages ) //页面永不销毁 - binding.workOrderViewPager.offscreenPageLimit = fragmentList.size - binding.workOrderViewPager.adapter = topViewPagerAdapter - binding.workOrderTabLayout.setupWithViewPager(binding.workOrderViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index cae5d67..a373ab1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -49,7 +49,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -70,8 +70,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -80,13 +80,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -107,7 +107,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 2b6f21d..a4e6702 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -55,7 +55,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -64,7 +64,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -104,13 +104,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 9b318ca..302257a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -58,7 +58,7 @@ when { isRefresh -> { notProcessedAdapter.setRefreshData(dataRows!!) - binding.notProcessedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -67,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } notProcessedAdapter.setLoadMoreData(dataRows!!) - binding.notProcessedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -107,13 +107,13 @@ } override fun initEvent() { - binding.notProcessedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notProcessedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 1b4df98..1fd3235 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -52,7 +52,7 @@ when { isRefresh -> { notConfirmedAdapter.setRefreshData(dataRows!!) - binding.notConfirmedLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -61,7 +61,7 @@ "到底了，别拉了".show(requireContext()) } notConfirmedAdapter.setLoadMoreData(dataRows!!) - binding.notConfirmedLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -73,8 +73,8 @@ } } - binding.notConfirmedView.addItemDecoration( - RecyclerViewItemOffsets(0, 5, 0, 5) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(0, 7, 0, 7) ) } @@ -83,13 +83,13 @@ } override fun initEvent() { - binding.notConfirmedLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 offset = 1 getWorkOrderListByState() } - binding.notConfirmedLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true offset++ getWorkOrderListByState() @@ -110,7 +110,7 @@ } else { binding.emptyInclude.emptyView.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - binding.notConfirmedView.adapter = notConfirmedAdapter + binding.recyclerView.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { override fun onClicked(position: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index 28a5078..70a6187 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -49,7 +49,7 @@ when { isRefresh -> { deployAdapter.setRefreshData(dataRows!!) - binding.deployedRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -58,7 +58,7 @@ "到底了，别拉了".show(context) } deployAdapter.setLoadMoreData(dataRows!!) - binding.deployedRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -89,13 +89,13 @@ } override fun initEvent() { - binding.deployedRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellListByPage() } - binding.deployedRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellListByPage() @@ -139,7 +139,7 @@ } else { binding.emptyInclude.emptyView.hide() deployAdapter = object : NormalRecyclerAdapter( - R.layout.item_deployed_rv, dataBeans + R.layout.item_deployed_rv_l, dataBeans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: WellListModel.DataBean.RowsBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 9270fa1..838898b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -73,34 +73,32 @@ binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem -> when (menuItem.itemId) { R.id.nav_home -> { - binding.mainViewPager.currentItem = 0 + binding.viewPager.currentItem = 0 } R.id.nav_order -> { - binding.mainViewPager.currentItem = 1 + binding.viewPager.currentItem = 1 } R.id.nav_notice -> { - binding.mainViewPager.currentItem = 2 + binding.viewPager.currentItem = 2 } R.id.nav_mine -> { - binding.mainViewPager.currentItem = 3 + binding.viewPager.currentItem = 3 } } false } - binding.mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) - binding.mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 - binding.mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + binding.viewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + binding.viewPager.offscreenPageLimit = fragmentPages.size //缓存页数 + binding.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { } override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int + position: Int, positionOffset: Float, positionOffsetPixels: Int ) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 7230f80..8c5d7be 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -42,10 +42,8 @@ val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) - //页面永不销毁 - binding.overTimeViewPager.offscreenPageLimit = fragmentPages.size - binding.overTimeViewPager.adapter = topViewPagerAdapter - binding.overTimeTabLayout.setupWithViewPager(binding.overTimeViewPager) + binding.viewPager.adapter = topViewPagerAdapter + binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 4f3a674..f352749 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -67,7 +67,7 @@ when { isRefresh -> { searchResultAdapter.setRefreshData(dataRows!!) - binding.resultRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -76,7 +76,7 @@ "到底了，别拉了".show(this) } searchResultAdapter.setLoadMoreData(dataRows!!) - binding.resultRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -133,13 +133,13 @@ } override fun initEvent() { - binding.resultRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getSearchResult() } - binding.resultRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getSearchResult() diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 555c278..3321c54 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -48,7 +48,7 @@ when { isRefresh -> { unDeployAdapter.setRefreshData(dataRows!!) - binding.undeployRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -57,7 +57,7 @@ "到底了，别拉了".show(context) } unDeployAdapter.setLoadMoreData(dataRows!!) - binding.undeployRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -87,13 +87,13 @@ } override fun initEvent() { - binding.undeployRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.undeployRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index b87bdb7..076b828 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -3,7 +3,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.adapter.SensorListAdapter +import com.casic.app.smartwell.adapter.SensorRecyclerViewAdapter import com.casic.app.smartwell.databinding.ActivityWellMonitorBinding import com.casic.app.smartwell.extensions.initImmersionBar import com.casic.app.smartwell.extensions.showEmptyPage @@ -47,7 +47,7 @@ } } else { binding.emptyInclude.emptyView.hide() - binding.sensorListView.adapter = SensorListAdapter(this, it.data!!) + binding.recyclerView.adapter = SensorRecyclerViewAdapter(this, it.data!!) } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 347ebb6..5cfb07b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -74,7 +74,7 @@ when { isRefresh -> { wellOperationAdapter.setRefreshData(dataRows!!) - binding.operationRefreshLayout.finishRefresh() + binding.refreshLayout.finishRefresh() isRefresh = false } @@ -83,7 +83,7 @@ "到底了，别拉了".show(context) } wellOperationAdapter.setLoadMoreData(dataRows!!) - binding.operationRefreshLayout.finishLoadMore() + binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -158,13 +158,13 @@ getWellList() } - binding.operationRefreshLayout.setOnRefreshListener { + binding.refreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 getWellList() } - binding.operationRefreshLayout.setOnLoadMoreListener { + binding.refreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ getWellList() diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 12815fd..9adde23 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -64,7 +64,7 @@ parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { return ItemViewHolder( - layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) + layoutInflater.inflate(R.layout.item_order_flow_rv_l, parent, false) ) } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt index f2c6cab..bf99a2a 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/WellTypePopupWindow.kt @@ -35,8 +35,8 @@ fun setupPopupData(itemList: List) { this.items = itemList - val popupListView = contentView.findViewById(R.id.popupListView) - setupListView(popupListView) + val listView = contentView.findViewById(R.id.listView) + setupListView(listView) } //给PopupWindow列表绑定数据 diff --git a/app/src/main/res/drawable/bg_image_view.xml b/app/src/main/res/drawable/bg_image_view.xml deleted file mode 100644 index f7eca2c..0000000 --- a/app/src/main/res/drawable/bg_image_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deployed_well.xml b/app/src/main/res/layout/activity_deployed_well.xml index ef12089..8eab74d 100644 --- a/app/src/main/res/layout/activity_deployed_well.xml +++ b/app/src/main/res/layout/activity_deployed_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 60ad732..36c9178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_order_overtime.xml b/app/src/main/res/layout/activity_order_overtime.xml index 0d2045e..bc9f83e 100644 --- a/app/src/main/res/layout/activity_order_overtime.xml +++ b/app/src/main/res/layout/activity_order_overtime.xml @@ -15,7 +15,7 @@ app:tbv_text="超时工单" /> diff --git a/app/src/main/res/layout/activity_order_search_result.xml b/app/src/main/res/layout/activity_order_search_result.xml index e1f1b70..febf304 100644 --- a/app/src/main/res/layout/activity_order_search_result.xml +++ b/app/src/main/res/layout/activity_order_search_result.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_undeploy_well.xml b/app/src/main/res/layout/activity_undeploy_well.xml index 0d77ac6..abd15b2 100644 --- a/app/src/main/res/layout/activity_undeploy_well.xml +++ b/app/src/main/res/layout/activity_undeploy_well.xml @@ -19,7 +19,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/activity_well_monitor.xml b/app/src/main/res/layout/activity_well_monitor.xml index 0cf4366..0d647b4 100644 --- a/app/src/main/res/layout/activity_well_monitor.xml +++ b/app/src/main/res/layout/activity_well_monitor.xml @@ -19,9 +19,9 @@ layout="@layout/include_empty_view" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_well_operation.xml b/app/src/main/res/layout/activity_well_operation.xml index 10bc379..475d9fb 100644 --- a/app/src/main/res/layout/activity_well_operation.xml +++ b/app/src/main/res/layout/activity_well_operation.xml @@ -16,7 +16,7 @@ layout="@layout/include_empty_view" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 086864d..91250dc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -56,9 +56,10 @@ android:background="@drawable/bg_solid_layout_white_radius_10"> diff --git a/app/src/main/res/layout/fragment_notice.xml b/app/src/main/res/layout/fragment_notice.xml index 0b0d7c3..d17cc53 100644 --- a/app/src/main/res/layout/fragment_notice.xml +++ b/app/src/main/res/layout/fragment_notice.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml index 5c92b7c..40ef37b 100644 --- a/app/src/main/res/layout/fragment_order.xml +++ b/app/src/main/res/layout/fragment_order.xml @@ -18,7 +18,7 @@ app:tbv_text="工单" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index f07b5a1..380b3c2 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -11,7 +11,7 @@ layout="@layout/include_empty_view" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> @@ -20,9 +20,10 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_deployed_rv.xml b/app/src/main/res/layout/item_deployed_rv.xml deleted file mode 100644 index fadcf1d..0000000 --- a/app/src/main/res/layout/item_deployed_rv.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_deployed_rv_l.xml b/app/src/main/res/layout/item_deployed_rv_l.xml new file mode 100644 index 0000000..fadcf1d --- /dev/null +++ b/app/src/main/res/layout/item_deployed_rv_l.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv.xml b/app/src/main/res/layout/item_expand_view_rv.xml deleted file mode 100644 index 446f51b..0000000 --- a/app/src/main/res/layout/item_expand_view_rv.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_expand_view_rv_l.xml b/app/src/main/res/layout/item_expand_view_rv_l.xml new file mode 100644 index 0000000..446f51b --- /dev/null +++ b/app/src/main/res/layout/item_expand_view_rv_l.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv.xml b/app/src/main/res/layout/item_home_page_rv.xml deleted file mode 100644 index 123f625..0000000 --- a/app/src/main/res/layout/item_home_page_rv.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_page_rv_g.xml b/app/src/main/res/layout/item_home_page_rv_g.xml new file mode 100644 index 0000000..f27b2ec --- /dev/null +++ b/app/src/main/res/layout/item_home_page_rv_g.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_completed_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv_l.xml b/app/src/main/res/layout/item_order_completed_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv.xml b/app/src/main/res/layout/item_order_flow_rv.xml deleted file mode 100644 index b4587be..0000000 --- a/app/src/main/res/layout/item_order_flow_rv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_flow_rv_l.xml b/app/src/main/res/layout/item_order_flow_rv_l.xml new file mode 100644 index 0000000..b4587be --- /dev/null +++ b/app/src/main/res/layout/item_order_flow_rv_l.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml deleted file mode 100644 index 3c78a0f..0000000 --- a/app/src/main/res/layout/item_order_in_handle_rv.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv_l.xml b/app/src/main/res/layout/item_order_in_handle_rv_l.xml new file mode 100644 index 0000000..5ce26f3 --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv_l.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml deleted file mode 100644 index 795d7e8..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_rv.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml new file mode 100644 index 0000000..5caf61f --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv_l.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml deleted file mode 100644 index 7e943c6..0000000 --- a/app/src/main/res/layout/item_order_not_processed_rv.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv_l.xml b/app/src/main/res/layout/item_order_not_processed_rv_l.xml new file mode 100644 index 0000000..7e943c6 --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv_l.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv.xml b/app/src/main/res/layout/item_search_result_rv.xml deleted file mode 100644 index 68dbd50..0000000 --- a/app/src/main/res/layout/item_search_result_rv.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_rv_l.xml b/app/src/main/res/layout/item_search_result_rv_l.xml new file mode 100644 index 0000000..68dbd50 --- /dev/null +++ b/app/src/main/res/layout/item_search_result_rv_l.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_sensor_list_rv.xml b/app/src/main/res/layout/item_sensor_list_rv.xml deleted file mode 100644 index a6419e0..0000000 --- a/app/src/main/res/layout/item_sensor_list_rv.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_sensor_rv_l.xml b/app/src/main/res/layout/item_sensor_rv_l.xml new file mode 100644 index 0000000..ab630ca --- /dev/null +++ b/app/src/main/res/layout/item_sensor_rv_l.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/popup_well_type.xml b/app/src/main/res/layout/popup_well_type.xml index 4e59df3..e843671 100644 --- a/app/src/main/res/layout/popup_well_type.xml +++ b/app/src/main/res/layout/popup_well_type.xml @@ -4,10 +4,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:backgroundTint="@color/popupColor" - app:cardCornerRadius="5dp"> + app:cardCornerRadius="@dimen/dp_5">