diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa724b7..426a199 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /build /captures .externalNativeBuild -.cxx -local.properties +.cxx \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce86a83..167cf0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,20 +1,21 @@ - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_only_show_title="true" + app:tbv_text="@string/app_name" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_only_show_title="true" + app:tbv_text="@string/app_name" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="详情" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_only_show_title="true" + app:tbv_text="@string/app_name" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="详情" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="标准规范" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_only_show_title="true" + app:tbv_text="@string/app_name" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="详情" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="标准规范" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="true" + app:tbv_text="场景识别中..." + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e37bd4..db128b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt index 9925205..a22f0a9 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryActivity.kt @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { @@ -31,8 +32,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.refreshLayout.setOnRefreshListener { isRefresh = true page = 1 @@ -132,5 +131,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 45e30bb..f5ec22e 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class CheckManifestActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt index 495f9f8..2cbb8fd 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class HiddenTroubleActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index dd9b982..bb3ccb8 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -6,12 +6,11 @@ import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.widget.TitleBarView class LibraryActivity : KotlinBaseActivity() { override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.standardButton.setOnClickListener { navigatePageTo() } @@ -43,5 +42,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt index 8dbc4ea..5f1f416 100644 --- a/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/PreviewPdfActivity.kt @@ -1,13 +1,16 @@ package com.casic.br.app.view import android.os.Bundle +import com.casic.br.app.R import com.casic.br.app.databinding.ActivityPreviewPdfBinding import com.casic.br.app.extensions.combineFilePath +import com.casic.br.app.extensions.initImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.FileInputStream @@ -50,6 +53,15 @@ } override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index 0471059..155a191 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class StandardFileActivity : KotlinBaseActivity(), Handler.Callback { @@ -32,8 +33,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -139,5 +138,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a6b13f6..88db066 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -26,6 +26,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -137,7 +138,11 @@ executor.execute { val image = imageProxy.image val bitmap = image?.toBitmap(ImageFormat.YUV_420_888) ?: return@execute - //TODO 开始调用算法检测物品 + //TODO 上传至后台分析图片 + val message = weakReferenceHandler.obtainMessage() + message.obj = bitmap + message.what = 2024031901 + weakReferenceHandler.sendMessage(message) //检测完之后close就会继续生成下一帧图片，否则就会被阻塞不会继续生成下一帧 imageProxy.close() @@ -147,25 +152,13 @@ } override fun handleMessage(msg: Message): Boolean { + if (msg.what == 2024031901) { + } return true } override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - - binding.rightButton.setOnClickListener { - SelectSceneDialog.Builder() - .setContext(this) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - Log.d(kTag, "onConfirmClick => $value") - } - }).build().show() - } - binding.stopButton.setOnClickListener { CheckResultDialog.Builder() .setContext(this) @@ -206,6 +199,23 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + SelectSceneDialog.Builder() + .setContext(this@StartCheckActivity) + .setPositiveButton("保存") + .setOnDialogButtonClickListener(object : + SelectSceneDialog.OnDialogButtonClickListener { + override fun onConfirmClick(value: String) { + Log.d(kTag, "onConfirmClick => $value") + } + }).build().show() + } + }) } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt index 2e1db1c..11c66ea 100644 --- a/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/VideoGuideActivity.kt @@ -17,6 +17,7 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView class VideoGuideActivity : KotlinBaseActivity(), Handler.Callback { @@ -30,8 +31,6 @@ private var isLoadMore = false override fun initEvent() { - binding.leftButton.setOnClickListener { finish() } - binding.searchButton.setOnClickListener { keywords = binding.searchView.text.toString().trim() } @@ -135,5 +134,14 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } + + override fun onRightClick() { + + } + }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index b6ed0f2..3953460 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -7,26 +7,18 @@ android:background="@color/themeColor" android:orientation="vertical"> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="巡查记录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="检查清单" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="隐患目录" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="知识库" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_only_show_title="true" + app:tbv_text="@string/app_name" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="详情" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="标准规范" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="true" + app:tbv_text="场景识别中..." + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" /> - - - - - - + android:layout_height="wrap_content" + android:background="@color/themeColor" + app:tbv_left_image="@drawable/ic_title_left" + app:tbv_only_show_title="false" + app:tbv_show_left_image="true" + app:tbv_show_right_image="false" + app:tbv_text="指导视频" + app:tbv_text_color="@color/white" + app:tbv_text_size="@dimen/sp_18" />