diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_base_info.xml b/app/src/main/res/layout/fragment_od_base_info.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_base_info.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_base_info.xml b/app/src/main/res/layout/fragment_od_base_info.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_base_info.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_device.xml b/app/src/main/res/layout/fragment_od_task_device.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_device.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_base_info.xml b/app/src/main/res/layout/fragment_od_base_info.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_base_info.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_device.xml b/app/src/main/res/layout/fragment_od_task_device.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_device.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_executor.xml b/app/src/main/res/layout/fragment_od_task_executor.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_executor.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_base_info.xml b/app/src/main/res/layout/fragment_od_base_info.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_base_info.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_device.xml b/app/src/main/res/layout/fragment_od_task_device.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_device.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_executor.xml b/app/src/main/res/layout/fragment_od_task_executor.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_executor.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_base_info.xml b/app/src/main/res/layout/fragment_train_base_info.xml new file mode 100644 index 0000000..2fb3e73 --- /dev/null +++ b/app/src/main/res/layout/fragment_train_base_info.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt index f827065..f4b7f5b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.CertificateViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_certificate_basic_information.* +import kotlinx.android.synthetic.main.fragment_certificate_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -67,7 +67,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_certificate_basic_information + override fun initLayoutView(): Int = R.layout.fragment_certificate_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt index 631675c..3dd3b21 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.ContractDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_contract_basic_information.* +import kotlinx.android.synthetic.main.fragment_contract_base_info.* class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { @@ -49,7 +49,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_contract_basic_information + override fun initLayoutView(): Int = R.layout.fragment_contract_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index a0e1358..3712db8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -7,7 +7,7 @@ import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.model.CustomerDetailModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_customer_basic_information.* +import kotlinx.android.synthetic.main.fragment_customer_base_info.* class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { @@ -55,7 +55,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_customer_basic_information + override fun initLayoutView(): Int = R.layout.fragment_customer_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 2b643af..0200731 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_device_basic_information.* +import kotlinx.android.synthetic.main.fragment_device_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -81,7 +81,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_device_basic_information + override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt index 0c5211d..93d783e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.vm.ConfigViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_entrust_basic_information.* +import kotlinx.android.synthetic.main.fragment_entrust_base_info.* class BasicInformationFragment(private val data: EntrustDetailModel.DataModel) : KotlinBaseFragment() { @@ -75,7 +75,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_entrust_basic_information + override fun initLayoutView(): Int = R.layout.fragment_entrust_base_info override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index eaa8003..9f007ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -11,7 +11,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* +import kotlinx.android.synthetic.main.fragment_equipment_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -101,7 +101,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_equipment_basic_information + override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { equipmentViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt new file mode 100644 index 0000000..bc3f6d1 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/ApprovalLogFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class ApprovalLogFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_approval_log + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt new file mode 100644 index 0000000..2acc9aa --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/BasicInformationFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BasicInformationFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_base_info + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt new file mode 100644 index 0000000..823eed6 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskDeviceFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskDeviceFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_device + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt new file mode 100644 index 0000000..ac68b19 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/TaskExecutorFragment.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.fragment.outfield + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TaskExecutorFragment : KotlinBaseFragment() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_od_task_executor + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5921a35..5d07147 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_train_basic_information.* +import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -39,7 +39,7 @@ } - override fun initLayoutView(): Int = R.layout.fragment_train_basic_information + override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { trainViewModel.loadState.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt index 6e5dd53..549b79a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt @@ -1,11 +1,17 @@ package com.casic.xz.meterage.view.home -import android.util.Log import android.view.View import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.fragment.outfield.ApprovalLogFragment +import com.casic.xz.meterage.fragment.outfield.BasicInformationFragment +import com.casic.xz.meterage.fragment.outfield.TaskDeviceFragment +import com.casic.xz.meterage.fragment.outfield.TaskExecutorFragment +import com.casic.xz.meterage.vm.OutfieldDetectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_outfield_detection_detail.* @@ -16,6 +22,7 @@ private val pageTitles = arrayOf("基础信息", "任务执行人", "携带设备", "审批流程") private var fragmentPages: ArrayList = ArrayList() private lateinit var args: ArrayList + private lateinit var outfieldDetectionViewModel: OutfieldDetectionViewModel override fun initLayoutView(): Int = R.layout.activity_outfield_detection_detail @@ -37,7 +44,18 @@ } } - Log.d(kTag, "initData => $args") + outfieldDetectionViewModel = ViewModelProvider(this)[OutfieldDetectionViewModel::class.java] + + fragmentPages.add(BasicInformationFragment()) + fragmentPages.add(TaskExecutorFragment()) + fragmentPages.add(TaskDeviceFragment()) + fragmentPages.add(ApprovalLogFragment()) + + approvalViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(approvalViewPager) } override fun observeRequestState() { diff --git a/app/src/main/res/layout/fragment_certificate_base_info.xml b/app/src/main/res/layout/fragment_certificate_base_info.xml new file mode 100644 index 0000000..b432f31 --- /dev/null +++ b/app/src/main/res/layout/fragment_certificate_base_info.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_certificate_basic_information.xml b/app/src/main/res/layout/fragment_certificate_basic_information.xml deleted file mode 100644 index b432f31..0000000 --- a/app/src/main/res/layout/fragment_certificate_basic_information.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_base_info.xml b/app/src/main/res/layout/fragment_contract_base_info.xml new file mode 100644 index 0000000..b4e9d26 --- /dev/null +++ b/app/src/main/res/layout/fragment_contract_base_info.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contract_basic_information.xml b/app/src/main/res/layout/fragment_contract_basic_information.xml deleted file mode 100644 index b4e9d26..0000000 --- a/app/src/main/res/layout/fragment_contract_basic_information.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_base_info.xml b/app/src/main/res/layout/fragment_customer_base_info.xml new file mode 100644 index 0000000..dec78c7 --- /dev/null +++ b/app/src/main/res/layout/fragment_customer_base_info.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_basic_information.xml b/app/src/main/res/layout/fragment_customer_basic_information.xml deleted file mode 100644 index dec78c7..0000000 --- a/app/src/main/res/layout/fragment_customer_basic_information.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_base_info.xml b/app/src/main/res/layout/fragment_device_base_info.xml new file mode 100644 index 0000000..53755ed --- /dev/null +++ b/app/src/main/res/layout/fragment_device_base_info.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_basic_information.xml b/app/src/main/res/layout/fragment_device_basic_information.xml deleted file mode 100644 index 53755ed..0000000 --- a/app/src/main/res/layout/fragment_device_basic_information.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_base_info.xml b/app/src/main/res/layout/fragment_entrust_base_info.xml new file mode 100644 index 0000000..3c23f9a --- /dev/null +++ b/app/src/main/res/layout/fragment_entrust_base_info.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_entrust_basic_information.xml b/app/src/main/res/layout/fragment_entrust_basic_information.xml deleted file mode 100644 index 3c23f9a..0000000 --- a/app/src/main/res/layout/fragment_entrust_basic_information.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_base_info.xml b/app/src/main/res/layout/fragment_equipment_base_info.xml new file mode 100644 index 0000000..53e9aa7 --- /dev/null +++ b/app/src/main/res/layout/fragment_equipment_base_info.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml deleted file mode 100644 index 53e9aa7..0000000 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_approval_log.xml b/app/src/main/res/layout/fragment_od_approval_log.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_approval_log.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_base_info.xml b/app/src/main/res/layout/fragment_od_base_info.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_base_info.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_device.xml b/app/src/main/res/layout/fragment_od_task_device.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_device.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_od_task_executor.xml b/app/src/main/res/layout/fragment_od_task_executor.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_od_task_executor.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_base_info.xml b/app/src/main/res/layout/fragment_train_base_info.xml new file mode 100644 index 0000000..2fb3e73 --- /dev/null +++ b/app/src/main/res/layout/fragment_train_base_info.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_basic_information.xml b/app/src/main/res/layout/fragment_train_basic_information.xml deleted file mode 100644 index 2fb3e73..0000000 --- a/app/src/main/res/layout/fragment_train_basic_information.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file