diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + - + - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + - + - + - + () { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + - + - + - + - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4512b85..f22e222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - 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 base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 19420f1..e029145 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class AlarmDetailActivity : KotlinBaseActivity() { @@ -34,9 +35,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 73e19bb..c050bde 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -29,6 +29,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,9 +50,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "人员信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 31ef291..16f98dc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -25,6 +25,7 @@ import com.pengxh.kt.lite.extensions.setScreenBrightness import com.pengxh.kt.lite.extensions.toBitmap import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -61,9 +62,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "入场申请人脸采集" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 4e81a22..4e0e389 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -32,6 +32,7 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelView +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet class MethaneActivity : KotlinBaseActivity(), Handler.Callback { @@ -119,8 +120,6 @@ } override fun initEvent() { - binding.titleInclude.leftBackView.setOnClickListener { finish() } - //连接TCP binding.connectButton.setOnClickListener { if (binding.addressView.text.isNullOrBlank()) { @@ -260,8 +259,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.titleView.text = "云台参数" + override fun onRightClick() { + + } + }) } override fun onDestroy() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 27c2966..0e16576 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -60,9 +61,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "事件信息" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c8b16ea..c3029cc 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -30,6 +30,7 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub +import com.pengxh.kt.lite.widget.TitleBarView class WorkSiteTabActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener, AMap.InfoWindowAdapter { @@ -50,9 +51,15 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) + binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { + override fun onLeftClick() { + finish() + } - binding.titleInclude.leftBackView.setOnClickListener { finish() } - binding.titleInclude.titleView.text = "燃气作业现场动态感知" + override fun onRightClick() { + + } + }) } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml deleted file mode 100644 index 04ee5da..0000000 --- a/app/src/main/res/drawable/ic_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml index 8b3c34b..55b453c 100644 --- a/app/src/main/res/layout/activity_alarm_detail.xml +++ b/app/src/main/res/layout/activity_alarm_detail.xml @@ -1,13 +1,23 @@ - + - + + android:src="@drawable/ic_title_left" /> - + - + - + - + - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_option_title.xml b/app/src/main/res/layout/include_option_title.xml index 50053e2..53d9287 100644 --- a/app/src/main/res/layout/include_option_title.xml +++ b/app/src/main/res/layout/include_option_title.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingHorizontal="@dimen/dp_10" - android:src="@drawable/ic_left" /> + android:src="@drawable/ic_title_left" />