diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt deleted file mode 100644 index 341c944..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.br.ar.app.view.hidden - -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.View -import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.ActivityHiddenElectricBoxBinding -import com.casic.br.ar.app.model.HiddenTroubleModel -import com.casic.br.ar.app.view.HiddenTroubleDetailActivity -import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub -import com.pengxh.kt.lite.utils.WeakReferenceHandler - -class ElectricBoxActivity : KotlinBaseActivity(), - Handler.Callback { - - private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel - private lateinit var troubleAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() - private var page = 1 - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - weakReferenceHandler = WeakReferenceHandler(this) - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] - getHiddenTroubleByScene() - hiddenTroubleViewModel.troublesResult.observe(this) { - if (it.code == 200) { - it.data?.rows?.apply { - dataBeans = this - weakReferenceHandler.sendEmptyMessage(2024052701) - } - } - } - } - - private fun getHiddenTroubleByScene() { - hiddenTroubleViewModel.getHiddenTroubleByScene(this, "配电箱", page) - } - - override fun handleMessage(msg: Message): Boolean { - when (msg.what) { - 2024052701 -> { - troubleAdapter = object : - NormalRecyclerAdapter( - R.layout.item_hidden_electric_box_l, dataBeans - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: HiddenTroubleModel.DataModel.RowsModel - ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.mainTypeView, item.mainClassName) - .setText(R.id.subTypeView, item.subClassName) - .setText(R.id.troubleNameView, item.name) - .setText(R.id.troubleContentView, item.content) - } - } - binding.recyclerView.adapter = troubleAdapter - troubleAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: HiddenTroubleModel.DataModel.RowsModel - ) { - navigatePageTo(arrayListOf("配电箱", t.id)) - } - }) - } - } - return true - } - - override fun initViewBinding(): ActivityHiddenElectricBoxBinding { - return ActivityHiddenElectricBoxBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - hiddenTroubleViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") - LoadState.Success -> { - LoadingDialogHub.dismiss() - } - - LoadState.Fail -> { - LoadingDialogHub.dismiss() - "数据加载失败，请重试".show(this) - } - } - } - } - - override fun setupTopBarLayout() { - val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) - window.decorView.systemUiVisibility = uiOptions - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt deleted file mode 100644 index 341c944..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.br.ar.app.view.hidden - -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.View -import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.ActivityHiddenElectricBoxBinding -import com.casic.br.ar.app.model.HiddenTroubleModel -import com.casic.br.ar.app.view.HiddenTroubleDetailActivity -import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub -import com.pengxh.kt.lite.utils.WeakReferenceHandler - -class ElectricBoxActivity : KotlinBaseActivity(), - Handler.Callback { - - private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel - private lateinit var troubleAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() - private var page = 1 - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - weakReferenceHandler = WeakReferenceHandler(this) - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] - getHiddenTroubleByScene() - hiddenTroubleViewModel.troublesResult.observe(this) { - if (it.code == 200) { - it.data?.rows?.apply { - dataBeans = this - weakReferenceHandler.sendEmptyMessage(2024052701) - } - } - } - } - - private fun getHiddenTroubleByScene() { - hiddenTroubleViewModel.getHiddenTroubleByScene(this, "配电箱", page) - } - - override fun handleMessage(msg: Message): Boolean { - when (msg.what) { - 2024052701 -> { - troubleAdapter = object : - NormalRecyclerAdapter( - R.layout.item_hidden_electric_box_l, dataBeans - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: HiddenTroubleModel.DataModel.RowsModel - ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.mainTypeView, item.mainClassName) - .setText(R.id.subTypeView, item.subClassName) - .setText(R.id.troubleNameView, item.name) - .setText(R.id.troubleContentView, item.content) - } - } - binding.recyclerView.adapter = troubleAdapter - troubleAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: HiddenTroubleModel.DataModel.RowsModel - ) { - navigatePageTo(arrayListOf("配电箱", t.id)) - } - }) - } - } - return true - } - - override fun initViewBinding(): ActivityHiddenElectricBoxBinding { - return ActivityHiddenElectricBoxBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - hiddenTroubleViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") - LoadState.Success -> { - LoadingDialogHub.dismiss() - } - - LoadState.Fail -> { - LoadingDialogHub.dismiss() - "数据加载失败，请重试".show(this) - } - } - } - } - - override fun setupTopBarLayout() { - val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) - window.decorView.systemUiVisibility = uiOptions - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt deleted file mode 100644 index 9b40f15..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.ar.app.view.manifest - -class ElectricBoxActivity { -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt deleted file mode 100644 index 341c944..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.br.ar.app.view.hidden - -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.View -import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.ActivityHiddenElectricBoxBinding -import com.casic.br.ar.app.model.HiddenTroubleModel -import com.casic.br.ar.app.view.HiddenTroubleDetailActivity -import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub -import com.pengxh.kt.lite.utils.WeakReferenceHandler - -class ElectricBoxActivity : KotlinBaseActivity(), - Handler.Callback { - - private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel - private lateinit var troubleAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() - private var page = 1 - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - weakReferenceHandler = WeakReferenceHandler(this) - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] - getHiddenTroubleByScene() - hiddenTroubleViewModel.troublesResult.observe(this) { - if (it.code == 200) { - it.data?.rows?.apply { - dataBeans = this - weakReferenceHandler.sendEmptyMessage(2024052701) - } - } - } - } - - private fun getHiddenTroubleByScene() { - hiddenTroubleViewModel.getHiddenTroubleByScene(this, "配电箱", page) - } - - override fun handleMessage(msg: Message): Boolean { - when (msg.what) { - 2024052701 -> { - troubleAdapter = object : - NormalRecyclerAdapter( - R.layout.item_hidden_electric_box_l, dataBeans - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: HiddenTroubleModel.DataModel.RowsModel - ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.mainTypeView, item.mainClassName) - .setText(R.id.subTypeView, item.subClassName) - .setText(R.id.troubleNameView, item.name) - .setText(R.id.troubleContentView, item.content) - } - } - binding.recyclerView.adapter = troubleAdapter - troubleAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: HiddenTroubleModel.DataModel.RowsModel - ) { - navigatePageTo(arrayListOf("配电箱", t.id)) - } - }) - } - } - return true - } - - override fun initViewBinding(): ActivityHiddenElectricBoxBinding { - return ActivityHiddenElectricBoxBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - hiddenTroubleViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") - LoadState.Success -> { - LoadingDialogHub.dismiss() - } - - LoadState.Fail -> { - LoadingDialogHub.dismiss() - "数据加载失败，请重试".show(this) - } - } - } - } - - override fun setupTopBarLayout() { - val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) - window.decorView.systemUiVisibility = uiOptions - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt deleted file mode 100644 index 9b40f15..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.ar.app.view.manifest - -class ElectricBoxActivity { -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt index d4d4ecf..0342013 100644 --- a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt +++ b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt @@ -20,9 +20,9 @@ val troublesResult = MutableLiveData() val troubleDetailResult = MutableLiveData() - fun getHiddenTroubleByScene(context: Context, keywords: String, offset: Int) = launch({ + fun getHiddenTroubleByScene(context: Context, scene: String, offset: Int) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getHiddenTroubleByScene(keywords, offset) + val response = RetrofitServiceManager.getHiddenTroubleByScene(scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt deleted file mode 100644 index 341c944..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.br.ar.app.view.hidden - -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.View -import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.ActivityHiddenElectricBoxBinding -import com.casic.br.ar.app.model.HiddenTroubleModel -import com.casic.br.ar.app.view.HiddenTroubleDetailActivity -import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub -import com.pengxh.kt.lite.utils.WeakReferenceHandler - -class ElectricBoxActivity : KotlinBaseActivity(), - Handler.Callback { - - private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel - private lateinit var troubleAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() - private var page = 1 - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - weakReferenceHandler = WeakReferenceHandler(this) - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] - getHiddenTroubleByScene() - hiddenTroubleViewModel.troublesResult.observe(this) { - if (it.code == 200) { - it.data?.rows?.apply { - dataBeans = this - weakReferenceHandler.sendEmptyMessage(2024052701) - } - } - } - } - - private fun getHiddenTroubleByScene() { - hiddenTroubleViewModel.getHiddenTroubleByScene(this, "配电箱", page) - } - - override fun handleMessage(msg: Message): Boolean { - when (msg.what) { - 2024052701 -> { - troubleAdapter = object : - NormalRecyclerAdapter( - R.layout.item_hidden_electric_box_l, dataBeans - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: HiddenTroubleModel.DataModel.RowsModel - ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.mainTypeView, item.mainClassName) - .setText(R.id.subTypeView, item.subClassName) - .setText(R.id.troubleNameView, item.name) - .setText(R.id.troubleContentView, item.content) - } - } - binding.recyclerView.adapter = troubleAdapter - troubleAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: HiddenTroubleModel.DataModel.RowsModel - ) { - navigatePageTo(arrayListOf("配电箱", t.id)) - } - }) - } - } - return true - } - - override fun initViewBinding(): ActivityHiddenElectricBoxBinding { - return ActivityHiddenElectricBoxBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - hiddenTroubleViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") - LoadState.Success -> { - LoadingDialogHub.dismiss() - } - - LoadState.Fail -> { - LoadingDialogHub.dismiss() - "数据加载失败，请重试".show(this) - } - } - } - } - - override fun setupTopBarLayout() { - val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) - window.decorView.systemUiVisibility = uiOptions - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt deleted file mode 100644 index 9b40f15..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.ar.app.view.manifest - -class ElectricBoxActivity { -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt index d4d4ecf..0342013 100644 --- a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt +++ b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt @@ -20,9 +20,9 @@ val troublesResult = MutableLiveData() val troubleDetailResult = MutableLiveData() - fun getHiddenTroubleByScene(context: Context, keywords: String, offset: Int) = launch({ + fun getHiddenTroubleByScene(context: Context, scene: String, offset: Int) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getHiddenTroubleByScene(keywords, offset) + val response = RetrofitServiceManager.getHiddenTroubleByScene(scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/res/layout/activity_hidden_electric_box.xml b/app/src/main/res/layout/activity_hidden_electric_box.xml deleted file mode 100644 index 3a69ac1..0000000 --- a/app/src/main/res/layout/activity_hidden_electric_box.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf8037..62c4479 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,7 +81,7 @@ android:name=".view.HiddenTroubleActivity" android:screenOrientation="landscape" /> { override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - when (t.name) { - // TODO 未完 - "配电箱" -> navigatePageTo() -// "调压站" -> navigatePageTo<>() -// "非居民用户" -> navigatePageTo<>() -// "建筑消防" -> navigatePageTo<>() -// "有限空间作业" -> navigatePageTo<>() - } + //穿字典值 + navigatePageTo(arrayListOf(t.name, t.value)) } }) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt index b200743..b291ab8 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleDetailActivity.kt @@ -19,6 +19,7 @@ class HiddenTroubleDetailActivity : KotlinBaseActivity() { + private val kTag = "HiddenTroubleDetailActivity" private val context = this private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt new file mode 100644 index 0000000..cfd56fe --- /dev/null +++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt @@ -0,0 +1,116 @@ +package com.casic.br.ar.app.view + +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.br.ar.app.R +import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding +import com.casic.br.ar.app.model.HiddenTroubleModel +import com.casic.br.ar.app.vm.HiddenTroubleViewModel +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +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.utils.WeakReferenceHandler + +class SceneHiddenTroubleActivity : KotlinBaseActivity(), + Handler.Callback { + + private lateinit var weakReferenceHandler: WeakReferenceHandler + private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel + private lateinit var troubleAdapter: NormalRecyclerAdapter + private var sceneCode = "" + private var dataBeans: MutableList = ArrayList() + private var page = 1 + + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList + + binding.titleView.text = "${args[0]}隐患目录" + + sceneCode = args[1] + + weakReferenceHandler = WeakReferenceHandler(this) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] + getHiddenTroubleByScene() + hiddenTroubleViewModel.troublesResult.observe(this) { + if (it.code == 200) { + it.data?.rows?.apply { + dataBeans = this + weakReferenceHandler.sendEmptyMessage(2024052701) + } + } + } + } + + private fun getHiddenTroubleByScene() { + hiddenTroubleViewModel.getHiddenTroubleByScene(this, sceneCode, page) + } + + override fun handleMessage(msg: Message): Boolean { + when (msg.what) { + 2024052701 -> { + troubleAdapter = object : + NormalRecyclerAdapter( + R.layout.item_hidden_electric_box_l, dataBeans + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: HiddenTroubleModel.DataModel.RowsModel + ) { + viewHolder.setText(R.id.indexView, "${position + 1}") + .setText(R.id.mainTypeView, item.mainClassName) + .setText(R.id.subTypeView, item.subClassName) + .setText(R.id.troubleNameView, item.name) + .setText(R.id.troubleContentView, item.content) + } + } + binding.recyclerView.adapter = troubleAdapter + troubleAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, t: HiddenTroubleModel.DataModel.RowsModel + ) { + navigatePageTo(arrayListOf(t.sceneName, t.id)) + } + }) + } + } + return true + } + + override fun initViewBinding(): ActivitySceneHiddenBinding { + return ActivitySceneHiddenBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + hiddenTroubleViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") + LoadState.Success -> { + LoadingDialogHub.dismiss() + } + + LoadState.Fail -> { + LoadingDialogHub.dismiss() + "数据加载失败，请重试".show(this) + } + } + } + } + + override fun setupTopBarLayout() { + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt deleted file mode 100644 index 341c944..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/hidden/ElectricBoxActivity.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.br.ar.app.view.hidden - -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.View -import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R -import com.casic.br.ar.app.databinding.ActivityHiddenElectricBoxBinding -import com.casic.br.ar.app.model.HiddenTroubleModel -import com.casic.br.ar.app.view.HiddenTroubleDetailActivity -import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LoadState -import com.pengxh.kt.lite.utils.LoadingDialogHub -import com.pengxh.kt.lite.utils.WeakReferenceHandler - -class ElectricBoxActivity : KotlinBaseActivity(), - Handler.Callback { - - private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel - private lateinit var troubleAdapter: NormalRecyclerAdapter - private var dataBeans: MutableList = ArrayList() - private var page = 1 - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - weakReferenceHandler = WeakReferenceHandler(this) - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] - getHiddenTroubleByScene() - hiddenTroubleViewModel.troublesResult.observe(this) { - if (it.code == 200) { - it.data?.rows?.apply { - dataBeans = this - weakReferenceHandler.sendEmptyMessage(2024052701) - } - } - } - } - - private fun getHiddenTroubleByScene() { - hiddenTroubleViewModel.getHiddenTroubleByScene(this, "配电箱", page) - } - - override fun handleMessage(msg: Message): Boolean { - when (msg.what) { - 2024052701 -> { - troubleAdapter = object : - NormalRecyclerAdapter( - R.layout.item_hidden_electric_box_l, dataBeans - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: HiddenTroubleModel.DataModel.RowsModel - ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.mainTypeView, item.mainClassName) - .setText(R.id.subTypeView, item.subClassName) - .setText(R.id.troubleNameView, item.name) - .setText(R.id.troubleContentView, item.content) - } - } - binding.recyclerView.adapter = troubleAdapter - troubleAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: HiddenTroubleModel.DataModel.RowsModel - ) { - navigatePageTo(arrayListOf("配电箱", t.id)) - } - }) - } - } - return true - } - - override fun initViewBinding(): ActivityHiddenElectricBoxBinding { - return ActivityHiddenElectricBoxBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - hiddenTroubleViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后...") - LoadState.Success -> { - LoadingDialogHub.dismiss() - } - - LoadState.Fail -> { - LoadingDialogHub.dismiss() - "数据加载失败，请重试".show(this) - } - } - } - } - - override fun setupTopBarLayout() { - val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) - window.decorView.systemUiVisibility = uiOptions - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt deleted file mode 100644 index 9b40f15..0000000 --- a/app/src/main/java/com/casic/br/ar/app/view/manifest/ElectricBoxActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.br.ar.app.view.manifest - -class ElectricBoxActivity { -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt index d4d4ecf..0342013 100644 --- a/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt +++ b/app/src/main/java/com/casic/br/ar/app/vm/HiddenTroubleViewModel.kt @@ -20,9 +20,9 @@ val troublesResult = MutableLiveData() val troubleDetailResult = MutableLiveData() - fun getHiddenTroubleByScene(context: Context, keywords: String, offset: Int) = launch({ + fun getHiddenTroubleByScene(context: Context, scene: String, offset: Int) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getHiddenTroubleByScene(keywords, offset) + val response = RetrofitServiceManager.getHiddenTroubleByScene(scene, offset) when (response.getResponseCode()) { 200 -> { loadState.value = LoadState.Success diff --git a/app/src/main/res/layout/activity_hidden_electric_box.xml b/app/src/main/res/layout/activity_hidden_electric_box.xml deleted file mode 100644 index 3a69ac1..0000000 --- a/app/src/main/res/layout/activity_hidden_electric_box.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scene_hidden.xml b/app/src/main/res/layout/activity_scene_hidden.xml new file mode 100644 index 0000000..c73575b --- /dev/null +++ b/app/src/main/res/layout/activity_scene_hidden.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file