diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt index 8aef89c..78990ef 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt index 8aef89c..78990ef 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt index 877534e..eec9294 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt index 8aef89c..78990ef 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt index 877534e..eec9294 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { 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 b8455c5..e4c198f 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.train +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.vm.MeterageTrainViewModel @@ -10,7 +11,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getMeterageTrainDetail(id) trainViewModel.meterageTrainDetail.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt index 8aef89c..78990ef 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt index 877534e..eec9294 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { 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 b8455c5..e4c198f 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.train +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.vm.MeterageTrainViewModel @@ -10,7 +11,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getMeterageTrainDetail(id) trainViewModel.meterageTrainDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt index a50fa71..774dee9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.train +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -21,7 +22,7 @@ private var dataBeans: MutableList = ArrayList() - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 2b429ee..c0c3a53 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,7 +106,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.6' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt index f48aa45..e3930de 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/BasicInformationFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -15,7 +16,7 @@ class BasicInformationFragment(private val data: DetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustNameView.text = data.customerName entrustContactView.text = data.customerPhone entrustAddressView.text = data.customerAddress diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt index 6251ffa..2f43295 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -8,7 +9,7 @@ * */ class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt index 3469449..ea19840 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/DetectionPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -31,7 +32,7 @@ fragmentPages.add(CompletedDetectionFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 6a56f25..ccd61bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.os.Handler import android.view.View import android.widget.LinearLayout @@ -57,7 +58,7 @@ QrManager.getInstance().init(QrConfigCreator.create(BaseApplication.get())) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { noticeSwitcherView.setFactory { val textView = TextView(requireContext()) textView.setTextColor(Color.BLACK) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt index f7eeb84..00c37b5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/InspectionRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.view.View import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage @@ -17,7 +18,7 @@ class InspectionRecordFragment(private val records: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (records.isEmpty()) { emptyView.showEmptyPage("无检定记录") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 87950d6..0fabaaa 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.os.Bundle import android.util.Log import android.view.View import android.widget.LinearLayout @@ -50,7 +51,7 @@ private lateinit var pushConfigViewModel: PushConfigViewModel private val clientId = SaveKeyValues.getValue(LocaleConstant.PUSH_ID, "") as String - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.userInfo.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt index 6bb5e9e..0436e83 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/TaskPageFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment +import android.os.Bundle import android.widget.LinearLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -33,7 +34,7 @@ fragmentPages.add(OvertimeTaskFragment()) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskCountResult.observe(this) { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt index f496089..dc59678 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ApprovalProcessFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.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 b1e9051..ff08eec 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.watchAttachFile @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getCertificateReportDetail(id) certificateViewModel.certificateDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt index 42f333a..622144e 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/CertificateReportFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -35,7 +36,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.certificateList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt index d65b528..fc1e9c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/certificate/ExceptionReportFragment.kt @@ -1,11 +1,12 @@ package com.casic.xz.meterage.fragment.certificate +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class ExceptionReportFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } 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 3dd3b21..a0d486a 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: ContractDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { contractCodeView.text = data.agreementNo contractNameView.text = data.agreementName contractTypeView.text = data.agreementTypeName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index 3b8d3bc..612dcf9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.showEmptyPage @@ -13,7 +14,7 @@ class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (paymentModels.isEmpty()) { emptyView.showEmptyPage("无相关收款信息") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt index 19139c8..0bf72b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/EntrustBriefFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.contract +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel @@ -13,7 +14,7 @@ class EntrustBriefFragment(private val orderModels: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (orderModels.isEmpty()) { emptyView.showEmptyPage("无相关委托书信息") } else { 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 3712db8..c69fa7b 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.toChineseGrade import com.casic.xz.meterage.extensions.watchAttachFile @@ -12,7 +13,7 @@ class BasicInformationFragment(private val data: CustomerDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { customerCodeView.text = data.customerNo briefNameView.text = data.briefName businessContentView.text = data.businessContent diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt index e681658..1467c7c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/CertificateFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -27,7 +28,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt index 1b9950a..b0b50c3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/ContractRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -29,7 +30,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index 56161df..f2e45cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor import com.casic.xz.meterage.extensions.showEmptyPage @@ -15,7 +16,7 @@ class PersonnelFragment(private val customerUsers: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (customerUsers.isEmpty()) { emptyView.showEmptyPage("无客户人员") } else { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt index 08981d7..5bb3aed 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/SampleRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.customer +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -26,7 +27,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt index 458792e..ba3e95a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/AwaitDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt index 80b588d..5da5a17 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/CompletedDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt index cd5bf2e..8948f1a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/detection/UnderDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.detection +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -34,7 +35,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.detectionList.observe(this) { 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 c83ec93..56f889f 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) equipmentViewModel.standardDeviceDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt index 62f87d9..2785da2 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 51b3375..06b116d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getStaffList(id) trainViewModel.staffList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index 4cc03d6..8ff597b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getSupportEquipmentList(id) equipmentViewModel.supportEquipmentList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 7e87a51..a1f7da1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.device +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var verifyViewModel: VerifyViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.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 592ce6c..935c758 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.CertificateTypeAdapter @@ -20,7 +21,7 @@ private lateinit var configViewModel: ConfigViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustCodeView.text = data.orderCode senderView.text = data.deliverer contactView.text = data.delivererTel diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index f0f57d2..3f9c2c4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -17,7 +18,7 @@ private lateinit var entrustViewModel: EntrustViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java] entrustViewModel.getEntrustLog(entrustId) entrustViewModel.logDetail.observe(this) { 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 f760fb7..c4800b2 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 @@ -2,6 +2,7 @@ import android.graphics.Color import android.graphics.Paint +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -15,7 +16,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) equipmentViewModel.equipmentDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt index 1c55901..407e8ab 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/CertificateFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class CertificateFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt index 69b6bbf..3e0304b 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/StateChangeLogFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -19,7 +20,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentStateChangeLog(id) equipmentViewModel.stateChangeResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index fe5f7f5..428eddd 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.generateColor @@ -18,7 +19,7 @@ private lateinit var equipmentViewModel: EquipmentViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt index 00b028b..3dcf02f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/WeeklyRecordFragment.kt @@ -1,10 +1,11 @@ package com.casic.xz.meterage.fragment.equipment +import android.os.Bundle import com.casic.xz.meterage.R import com.pengxh.kt.lite.base.KotlinBaseFragment class WeeklyRecordFragment : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt index e1153f5..9a56bc8 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/file/StandardFileFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.file +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) fileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java] fileViewModel.fileList.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 index 0d2cd2b..408573a 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.ApprovalProcessAdapter @@ -13,7 +14,7 @@ private lateinit var certificateViewModel: CertificateViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { certificateViewModel = ViewModelProvider(this)[CertificateViewModel::class.java] certificateViewModel.getApprovalProcess(processId) certificateViewModel.processResult.observe(this) { 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 index f05e944..5aac53d 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.model.OutfieldDetectionDetailModel @@ -9,7 +10,7 @@ class BasicInformationFragment(private val data: OutfieldDetectionDetailModel.DataModel) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { odCodeView.text = data.siteExecutiveNo odNameView.text = data.siteExecutiveName directorNameView.text = data.directorName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt index f1e3601..3a49140 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/outfield/OutfieldDetectionFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -36,7 +37,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java] detectionViewModel.outfieldDetectionList.observe(this) { 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 index d5fb358..bee2a52 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -16,7 +17,7 @@ class TaskDeviceFragment(private val devices: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { if (devices.isEmpty()) { emptyView.showEmptyPage("该检测任务暂无设备信息") } else { 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 index df00421..37723cf 100644 --- 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.outfield +import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay @@ -14,7 +15,7 @@ class TaskExecutorFragment(private val executors: List) : KotlinBaseFragment() { - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val staffAdapter = object : NormalRecyclerAdapter( R.layout.item_staff_rv_l, executors.toMutableList() diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt index cce534b..37e643c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/AwaitTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -32,7 +33,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt index 0184606..9789692 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/CompletedTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt index 8aef89c..78990ef 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/OvertimeTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt index 877534e..eec9294 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/task/UnderTaskFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.task +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -31,7 +32,7 @@ private var isRefresh = false private var isLoadMore = false - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { 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 b8455c5..e4c198f 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 @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.train +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.vm.MeterageTrainViewModel @@ -10,7 +11,7 @@ private lateinit var trainViewModel: MeterageTrainViewModel - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] trainViewModel.getMeterageTrainDetail(id) trainViewModel.meterageTrainDetail.observe(this) { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt index a50fa71..774dee9 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/StudentsFragment.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.fragment.train +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R @@ -21,7 +22,7 @@ private var dataBeans: MutableList = ArrayList() - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) trainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] diff --git a/app/src/main/java/com/casic/xz/meterage/service/MeterageIntentService.kt b/app/src/main/java/com/casic/xz/meterage/service/MeterageIntentService.kt index 99d3dcb..1a7b01c 100644 --- a/app/src/main/java/com/casic/xz/meterage/service/MeterageIntentService.kt +++ b/app/src/main/java/com/casic/xz/meterage/service/MeterageIntentService.kt @@ -55,6 +55,12 @@ // 通知点击 override fun onNotificationMessageClicked(context: Context?, msg: GTNotificationMessage?) { - Log.d(kTag, "通知点击 -> ${msg?.title}") + if (msg == null) { + return + } + val messageModel = gson.fromJson( + msg.content, object : TypeToken() {}.type + ) + Log.d(kTag, "通知点击 -> ${messageModel.messageTitle}") } } \ No newline at end of file