diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index e1395d1..5e95a8b 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:text="巡查时间" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:text="发现隐患" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2e255..5109dd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index e1395d1..5e95a8b 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:text="巡查时间" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:text="发现隐患" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> diff --git a/app/src/main/res/layout/activity_hidden_trouble_detail.xml b/app/src/main/res/layout/activity_hidden_trouble_detail.xml index af30ed7..2b23c1a 100644 --- a/app/src/main/res/layout/activity_hidden_trouble_detail.xml +++ b/app/src/main/res/layout/activity_hidden_trouble_detail.xml @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:text="隐患类别" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index e1395d1..5e95a8b 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:text="巡查时间" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:text="发现隐患" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> diff --git a/app/src/main/res/layout/activity_hidden_trouble_detail.xml b/app/src/main/res/layout/activity_hidden_trouble_detail.xml index af30ed7..2b23c1a 100644 --- a/app/src/main/res/layout/activity_hidden_trouble_detail.xml +++ b/app/src/main/res/layout/activity_hidden_trouble_detail.xml @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:text="隐患类别" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index e1395d1..5e95a8b 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:text="巡查时间" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:text="发现隐患" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> diff --git a/app/src/main/res/layout/activity_hidden_trouble_detail.xml b/app/src/main/res/layout/activity_hidden_trouble_detail.xml index af30ed7..2b23c1a 100644 --- a/app/src/main/res/layout/activity_hidden_trouble_detail.xml +++ b/app/src/main/res/layout/activity_hidden_trouble_detail.xml @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:text="隐患类别" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bc10cc..60684eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,17 @@ android:theme="@style/Theme.BigImageActivity" /> + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt new file mode 100644 index 0000000..6531392 --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/utils/BootBroadcastReceiver.kt @@ -0,0 +1,18 @@ +package com.casic.br.ar.app.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.casic.br.ar.app.view.LoginActivity + +class BootBroadcastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (this.action.equals("android.intent.action.BOOT_COMPLETED")) { + val i = Intent(context, LoginActivity::class.java) + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context?.startActivity(i) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt index dfe37ca..7a56dcd 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt @@ -21,6 +21,7 @@ class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback { + private val kTag = "CheckHistoryActivity" private val weakReferenceHandler by lazy { WeakReferenceHandler(this) } private lateinit var checkHistoryViewModel: CheckHistoryViewModel private lateinit var checkHistoryAdapter: NormalRecyclerAdapter @@ -28,7 +29,15 @@ private var page = 1 override fun initEvent() { + binding.included.lastPageView.setOnClickListener { + page-- + getCheckHistoryByPage() + } + binding.included.nextPageView.setOnClickListener { + page++ + getCheckHistoryByPage() + } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -36,6 +45,7 @@ getCheckHistoryByPage() checkHistoryViewModel.historyResult.observe(this) { if (it.code == 200) { + binding.included.currentPageView.text = "$page/${it.data.total}" it.data?.rows?.apply { dataBeans = this weakReferenceHandler.sendEmptyMessage(2024052101) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt deleted file mode 100644 index 996134e..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckResultDialog.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogCheckResultBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams - -class CheckResultDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val negativeBtn = builder.negativeBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var negativeBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - this.positiveBtn = name - return this - } - - fun setNegativeButton(name: String): Builder { - this.negativeBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): CheckResultDialog { - return CheckResultDialog(this) - } - } - - private val binding: DialogCheckResultBinding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(1f) - setCanceledOnTouchOutside(false) - - - binding.dialogConfirmButton.setOnClickListener { - - } - - - if (negativeBtn.isNotBlank()) { - binding.dialogCancelButton.text = negativeBtn - } - binding.dialogCancelButton.setOnClickListener { - listener.onCancelClick() - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick() - - fun onCancelClick() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt deleted file mode 100644 index 11fce59..0000000 --- a/app/src/main/java/com/casic/br/ar/app/widgets/SelectSceneDialog.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.casic.br.ar.app.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import android.widget.AdapterView -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.DialogSelectSceneBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class SelectSceneDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val context = builder.context - private val positiveBtn = builder.positiveBtn - private val listener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var positiveBtn: String - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setPositiveButton(name: String): Builder { - positiveBtn = name - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): SelectSceneDialog { - return SelectSceneDialog(this) - } - } - - private val binding: DialogSelectSceneBinding by binding() - private var selectedValue = "请选择场景" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCanceledOnTouchOutside(true) - - val sceneArray = context.resources.getStringArray(R.array.scene_data) - - if (positiveBtn.isNotBlank()) { - binding.dialogConfirmButton.text = positiveBtn - } - - binding.sceneSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedValue = sceneArray[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - - binding.dialogConfirmButton.setOnClickListener { - if (selectedValue == "请选择场景") { - "场景选择错误，请检查！".show(context) - return@setOnClickListener - } - listener.onConfirmClick(selectedValue) - dismiss() - } - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(value: String) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml index 6a70978..ad1de77 100644 --- a/app/src/main/res/drawable/ic_check_no.xml +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + android:textColor="@color/white" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_history_detail.xml b/app/src/main/res/layout/activity_check_history_detail.xml index e1395d1..5e95a8b 100644 --- a/app/src/main/res/layout/activity_check_history_detail.xml +++ b/app/src/main/res/layout/activity_check_history_detail.xml @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:text="巡查时间" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:text="发现隐患" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> diff --git a/app/src/main/res/layout/activity_hidden_trouble_detail.xml b/app/src/main/res/layout/activity_hidden_trouble_detail.xml index af30ed7..2b23c1a 100644 --- a/app/src/main/res/layout/activity_hidden_trouble_detail.xml +++ b/app/src/main/res/layout/activity_hidden_trouble_detail.xml @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:text="隐患类别" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> + /> - - - - - - - - - - - - -