diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9e50ba3..171dbbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,12 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_well_management.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_management.refreshLayout +import kotlinx.android.synthetic.main.activity_well_management.wellListView +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellManagementActivity : KotlinBaseActivity() { @@ -54,7 +58,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9e50ba3..171dbbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,12 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_well_management.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_management.refreshLayout +import kotlinx.android.synthetic.main.activity_well_management.wellListView +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellManagementActivity : KotlinBaseActivity() { @@ -54,7 +58,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 5c78e0a..9b2f489 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -13,9 +14,10 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_well_monitor.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_well_monitor.sensorListView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class WellMonitorActivity : KotlinBaseActivity() { @@ -32,7 +34,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9e50ba3..171dbbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,12 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_well_management.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_management.refreshLayout +import kotlinx.android.synthetic.main.activity_well_management.wellListView +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellManagementActivity : KotlinBaseActivity() { @@ -54,7 +58,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 5c78e0a..9b2f489 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -13,9 +14,10 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_well_monitor.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_well_monitor.sensorListView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class WellMonitorActivity : KotlinBaseActivity() { @@ -32,7 +34,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index d68ab88..4392aad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -28,9 +29,12 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_operation.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_operation.operationListView +import kotlinx.android.synthetic.main.activity_well_operation.operationRefreshLayout +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellOperationActivity : KotlinBaseActivity() { @@ -57,7 +61,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9e50ba3..171dbbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,12 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_well_management.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_management.refreshLayout +import kotlinx.android.synthetic.main.activity_well_management.wellListView +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellManagementActivity : KotlinBaseActivity() { @@ -54,7 +58,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 5c78e0a..9b2f489 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -13,9 +14,10 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_well_monitor.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_well_monitor.sensorListView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class WellMonitorActivity : KotlinBaseActivity() { @@ -32,7 +34,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index d68ab88..4392aad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -28,9 +29,12 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_operation.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_operation.operationListView +import kotlinx.android.synthetic.main.activity_well_operation.operationRefreshLayout +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellOperationActivity : KotlinBaseActivity() { @@ -57,7 +61,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/build.gradle b/build.gradle index f67b11e..efe2f64 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' @@ -27,6 +27,6 @@ } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/app/build.gradle b/app/build.gradle index 576c1a5..f967d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,12 @@ keyPassword '123456789' } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.app.smartwell" minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 14 versionName "1.1.4" @@ -60,8 +60,8 @@ } } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "ZQ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +69,7 @@ greendao { schemaVersion 2//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.app.smartwell.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } @@ -81,7 +81,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + 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' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c694074..a86bc9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -30,10 +29,14 @@ - - + + + + + + ( diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 30cf2ad..30e9364 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderLayout +import kotlinx.android.synthetic.main.fragment_order_completed.completedOrderView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderCompletedFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index 0074200..4aec066 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_in_handle.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleLayout +import kotlinx.android.synthetic.main.fragment_order_in_handle.inHandleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderInHandleFragment : KotlinBaseFragment() { @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt index 0d639fc..753b101 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import androidx.fragment.app.Fragment import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.TopViewPagerAdapter @@ -7,7 +8,10 @@ import com.casic.app.smartwell.view.SearchOrderActivity import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo -import kotlinx.android.synthetic.main.fragment_order.* +import kotlinx.android.synthetic.main.fragment_order.rightOptionView +import kotlinx.android.synthetic.main.fragment_order.titleView +import kotlinx.android.synthetic.main.fragment_order.workOrderTabLayout +import kotlinx.android.synthetic.main.fragment_order.workOrderViewPager class OrderListFragment : KotlinBaseFragment() { @@ -26,7 +30,7 @@ titleView.text = "工单" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( childFragmentManager, LocaleConstant.SUB_PAGE_TITLES, fragmentList ) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 4a72bf8..11a0809 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotConfirmedFragment : KotlinBaseFragment() { @@ -33,7 +35,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] workOrderListViewModel.resultModel.observe(this) { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index a1994cc..7a6679a 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class OrderNotProcessedFragment : KotlinBaseFragment() { @@ -39,7 +41,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 89b245c..b3d2cf1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,8 +19,9 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.fragment_order_not_processed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedLayout +import kotlinx.android.synthetic.main.fragment_order_not_processed.notProcessedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未接单和待处理一样，可以共用布局和adapter @@ -42,7 +44,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index e2104da..7a789b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.fragment +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_order_not_confirmed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedLayout +import kotlinx.android.synthetic.main.fragment_order_not_confirmed.notConfirmedView +import kotlinx.android.synthetic.main.include_empty_view.emptyView /** * 超时未处理和待确认一样，可以共用布局和adapter @@ -36,7 +38,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 2b26608..1c98651 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt index 1b74ce9..1d9776a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/AboutUsActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_about_us.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_about_us.versionCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class AboutUsActivity : KotlinBaseActivity() { override fun initLayoutView(): Int = R.layout.activity_about_us @@ -22,7 +24,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } diff --git a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt index 34a6b49..faed74d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,8 +15,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* +import kotlinx.android.synthetic.main.activity_big_image.imagePagerView +import kotlinx.android.synthetic.main.activity_big_image.leftBackView +import kotlinx.android.synthetic.main.activity_big_image.pageNumberView class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +28,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index bf19eb2..83bc0ce 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -16,8 +17,12 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_change_pwd.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_change_pwd.newPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.oldPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.repeatPasswordView +import kotlinx.android.synthetic.main.activity_change_pwd.submitButton +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.nio.charset.StandardCharsets class ChangePasswordActivity : KotlinBaseActivity() { @@ -35,7 +40,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt index fb9be4d..cd97f2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -23,9 +24,11 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_deployed_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_deployed_well.deployedListView +import kotlinx.android.synthetic.main.activity_deployed_well.deployedRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class DeployedWellActivity : KotlinBaseActivity() { @@ -40,7 +43,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt index cc4d4fd..00a2b05 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/HelpCenterActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import android.webkit.WebViewClient import com.casic.app.smartwell.R @@ -7,8 +8,9 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_help_center.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_help_center.answerView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class HelpCenterActivity : KotlinBaseActivity() { @@ -23,7 +25,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { answerView.loadUrl("file:///android_asset/h5/HelpCenterH5.html") answerView.settings.defaultTextEncodingName = "utf-8" answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index d38039e..3ad1cbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,7 +19,10 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues -import kotlinx.android.synthetic.main.activity_login.* +import kotlinx.android.synthetic.main.activity_login.changeServerLayout +import kotlinx.android.synthetic.main.activity_login.loginButton +import kotlinx.android.synthetic.main.activity_login.userNameView +import kotlinx.android.synthetic.main.activity_login.userPasswordView class LoginActivity : KotlinBaseActivity() { @@ -33,7 +37,7 @@ ImmersionBar.with(this).statusBarDarkFont(true).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 347b952..fe40e69 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.MenuItem @@ -21,7 +22,8 @@ import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main.bottomNavigation +import kotlinx.android.synthetic.main.activity_main.mainViewPager class MainActivity : KotlinBaseActivity() { @@ -49,7 +51,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //推送，多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 590a6aa..618838b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -18,9 +19,26 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_completed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.completedDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.confirmPersonView +import kotlinx.android.synthetic.main.activity_order_completed_detail.currentStateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_completed_detail.imageGridView +import kotlinx.android.synthetic.main.activity_order_completed_detail.stateTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderCompletedDetailActivity : KotlinBaseActivity() { @@ -38,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 82e7fe3..685195d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -71,7 +72,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 07195f5..5bcd813 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -40,9 +41,28 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.abnormalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.acceptDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.addImageRecyclerView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.inputLengthView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.normalRadioButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.sceneEditView +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.submitButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferOrderButton +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.transferTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView import java.io.File class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { @@ -70,7 +90,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 774cf69..e20ce45 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -20,9 +21,21 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* -import kotlinx.android.synthetic.main.include_base_order_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.acceptOrderButton +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.dispatchDateView +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.navigationButton +import kotlinx.android.synthetic.main.include_base_order_detail.alarmContentView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmDateView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmLevelView +import kotlinx.android.synthetic.main.include_base_order_detail.alarmValueView +import kotlinx.android.synthetic.main.include_base_order_detail.deptNameView +import kotlinx.android.synthetic.main.include_base_order_detail.devCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.locationTipsView +import kotlinx.android.synthetic.main.include_base_order_detail.orderCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellCodeView +import kotlinx.android.synthetic.main.include_base_order_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OrderNotProcessedDetailActivity : KotlinBaseActivity() { @@ -43,7 +56,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index a2e7b75..381160b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.casic.app.smartwell.R @@ -11,8 +12,10 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_order_overtime.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeTabLayout +import kotlinx.android.synthetic.main.activity_order_overtime.overTimeViewPager +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class OvertimeOrderActivity : KotlinBaseActivity() { @@ -34,7 +37,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val topViewPagerAdapter = TopViewPagerAdapter( supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 8cfe65c..419dbc1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -40,9 +40,7 @@ } override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray + requestCode: Int, permissions: Array, grantResults: IntArray ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 910aae8..fb9a447 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -1,12 +1,17 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.* +import com.casic.app.smartwell.extensions.addAll +import com.casic.app.smartwell.extensions.isEarlierThanStart +import com.casic.app.smartwell.extensions.timestampToDate +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.extensions.toLevel import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant @@ -23,8 +28,16 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.zhy.view.flowlayout.FlowLayout import com.zhy.view.flowlayout.TagAdapter -import kotlinx.android.synthetic.main.activity_order_search.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_order_search.alarmContentLayout +import kotlinx.android.synthetic.main.activity_order_search.alarmLevelLayout +import kotlinx.android.synthetic.main.activity_order_search.clearButton +import kotlinx.android.synthetic.main.activity_order_search.endTimeView +import kotlinx.android.synthetic.main.activity_order_search.orderStatusLayout +import kotlinx.android.synthetic.main.activity_order_search.searchButton +import kotlinx.android.synthetic.main.activity_order_search.startTimeView +import kotlinx.android.synthetic.main.activity_order_search.wellCodeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class SearchOrderActivity : KotlinBaseActivity() { @@ -55,7 +68,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { inflater = LayoutInflater.from(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.obtainUserDetail() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index a50274a..3db4ff6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,11 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_order_search_result.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_order_search_result.resultRecyclerView +import kotlinx.android.synthetic.main.activity_order_search_result.resultRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -54,7 +57,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index f031966..f8b7b8b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -38,7 +39,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } diff --git a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt index 50a537b..4306eec 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -22,9 +23,11 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_undeploy_well.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployListView +import kotlinx.android.synthetic.main.activity_undeploy_well.undeployRefreshLayout +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class UnDeployWellActivity : KotlinBaseActivity() { @@ -39,7 +42,7 @@ private var isLoadMore = false private var clickedPosition = 0 - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index 3745111..c56c9d1 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -17,9 +18,14 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_user_detail.* +import kotlinx.android.synthetic.main.activity_user_detail.changePwdLayout +import kotlinx.android.synthetic.main.activity_user_detail.loginOutButton +import kotlinx.android.synthetic.main.activity_user_detail.userDeptView +import kotlinx.android.synthetic.main.activity_user_detail.userPhoneView +import kotlinx.android.synthetic.main.activity_user_detail.userRealNameView import kotlinx.android.synthetic.main.fragment_mine.userNameView -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class UserDetailActivity : KotlinBaseActivity() { @@ -38,7 +44,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index e9870db..0fe7aee 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -19,8 +20,18 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.activity_well_detail.imageGridView +import kotlinx.android.synthetic.main.activity_well_detail.monitorLayout +import kotlinx.android.synthetic.main.activity_well_detail.navigationButton +import kotlinx.android.synthetic.main.activity_well_detail.tipsImageView +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellDepthView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.activity_well_detail.wellNameView +import kotlinx.android.synthetic.main.activity_well_detail.wellStateView +import kotlinx.android.synthetic.main.activity_well_detail.wellTypeView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView class WellDetailActivity : KotlinBaseActivity() { @@ -39,7 +50,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9e50ba3..171dbbb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -25,9 +26,12 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.activity_well_management.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_management.refreshLayout +import kotlinx.android.synthetic.main.activity_well_management.wellListView +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellManagementActivity : KotlinBaseActivity() { @@ -54,7 +58,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 5c78e0a..9b2f489 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -1,5 +1,6 @@ package com.casic.app.smartwell.view +import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R @@ -13,9 +14,10 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_well_monitor.* -import kotlinx.android.synthetic.main.include_base_title.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.activity_well_monitor.sensorListView +import kotlinx.android.synthetic.main.include_base_title.leftBackView +import kotlinx.android.synthetic.main.include_base_title.titleView +import kotlinx.android.synthetic.main.include_empty_view.emptyView class WellMonitorActivity : KotlinBaseActivity() { @@ -32,7 +34,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index d68ab88..4392aad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.view import android.content.Context +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -28,9 +29,12 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_operation.* -import kotlinx.android.synthetic.main.include_empty_view.* -import kotlinx.android.synthetic.main.include_search_bar.* +import kotlinx.android.synthetic.main.activity_well_operation.operationListView +import kotlinx.android.synthetic.main.activity_well_operation.operationRefreshLayout +import kotlinx.android.synthetic.main.include_empty_view.emptyView +import kotlinx.android.synthetic.main.include_search_bar.searchInputView +import kotlinx.android.synthetic.main.include_search_bar.searchTextView +import kotlinx.android.synthetic.main.include_search_bar.wellTypeView class WellOperationActivity : KotlinBaseActivity() { @@ -57,7 +61,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) diff --git a/build.gradle b/build.gradle index f67b11e..efe2f64 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' @@ -27,6 +27,6 @@ } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 863ad80..9378a49 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip