diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 76cc9c6..5bc31c6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,6 +69,9 @@ + diff --git a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt index a03b2c0..c7bda4b 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt @@ -25,6 +25,11 @@ object OfflineCmdServiceHelper { add(OfflineCmdBean("退出", "tui chu")) add(OfflineCmdBean("返回", "fan hui")) add(OfflineCmdBean("退回", "tui hui")) + add(OfflineCmdBean("同意", "tong yi")) + add(OfflineCmdBean("驳回", "bo hui")) + add(OfflineCmdBean("不同意", "bu tong yi")) + add(OfflineCmdBean("拒绝", "ju jue")) + add(OfflineCmdBean("通过", "tong guo")) } fun init(){ val service = GlassSdk.getGlassOfflineCmdService() diff --git a/app/src/main/java/com/nova/brain/glass/model/ItemItem.kt b/app/src/main/java/com/nova/brain/glass/model/ItemItem.kt new file mode 100644 index 0000000..2c529ce --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/model/ItemItem.kt @@ -0,0 +1,6 @@ +package com.nova.brain.glass.model + +import com.xuqm.base.adapter.BaseItem + +data class ItemItem(val text: String): BaseItem() { +} diff --git a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt new file mode 100644 index 0000000..09b054c --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt @@ -0,0 +1,37 @@ +package com.nova.brain.glass.ui + +import com.nova.brain.glass.R +import com.nova.brain.glass.databinding.ActivityFoBinding +import com.nova.brain.glass.databinding.ActivityReviewBinding +import com.nova.brain.glass.helper.OfflineCmdListener +import com.nova.brain.glass.helper.OfflineCmdServiceHelper +import com.xuqm.base.ui.BaseActivity + +class InspectionActivity : BaseActivity() { + override fun getLayoutId(): Int =R.layout.activity_review + override fun fullscreen(): Boolean = true + private val listener = object : OfflineCmdListener { + override fun onOfflineCmd(cmd: String) { + when( cmd){ + "退出","返回","退回"->{ + finish() + } + "驳回","拒绝","不同意"->{ + finish() + } + "同意","通过"->{ + finish() + } + } + } + } + override fun initData() { + super.initData() + OfflineCmdServiceHelper.addOnLineListener(listener) + } + + override fun onDestroy() { + super.onDestroy() + OfflineCmdServiceHelper.removeOnLineListener(listener) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/ui/ReviewActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/ReviewActivity.kt new file mode 100644 index 0000000..3134be1 --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/ui/ReviewActivity.kt @@ -0,0 +1,64 @@ +package com.nova.brain.glass.ui + +import android.content.Intent +import com.nova.brain.glass.R +import com.nova.brain.glass.databinding.ActivityFoBinding +import com.nova.brain.glass.databinding.ActivityReviewBinding +import com.nova.brain.glass.helper.OfflineCmdListener +import com.nova.brain.glass.helper.OfflineCmdServiceHelper +import com.nova.brain.glass.model.ItemItem +import com.nova.brain.glass.model.TaskItem +import com.nova.brain.glass.viewmodel.ItemListVM +import com.xuqm.base.adapter.BasePagedAdapter +import com.xuqm.base.adapter.CommonPagedAdapter +import com.xuqm.base.adapter.ViewHolder +import com.xuqm.base.ui.BaseActivity +import com.xuqm.base.ui.BaseListFormLayoutActivity + +class ReviewActivity : BaseListFormLayoutActivity() { + override fun getLayoutId(): Int =R.layout.activity_review + override fun fullscreen(): Boolean = true + private val listener = object : OfflineCmdListener { + override fun onOfflineCmd(cmd: String) { + when( cmd){ + "退出","返回","退回"->{ + finish() + } + "驳回","拒绝","不同意"->{ + finish() + } + "同意","通过"->{ + finish() + } + } + } + } + override fun initData() { + super.initData() + OfflineCmdServiceHelper.addOnLineListener(listener) + } + + override fun onDestroy() { + super.onDestroy() + OfflineCmdServiceHelper.removeOnLineListener(listener) + } + + private val adapter = object : CommonPagedAdapter(R.layout.item_item) { + override fun convert(holder: ViewHolder, item: ItemItem, position: Int) { + holder + .setText(R.id.text, item.text) + .setClickListener(R.id.text + ) { + when(item.text){ + "同意" -> { + finish() + } + "拒绝" -> { + finish() + } + } + } + } + } + override fun adapter(): BasePagedAdapter = adapter +} \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt index d45547a..d16a862 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt @@ -12,6 +12,7 @@ import com.nova.brain.glass.viewmodel.TaskListVM import com.xuqm.base.adapter.BasePagedAdapter import com.xuqm.base.adapter.CommonPagedAdapter import com.xuqm.base.adapter.ViewHolder +import com.xuqm.base.common.LogHelper import com.xuqm.base.common.ToolsHelper import com.xuqm.base.ui.BaseListFormLayoutActivity @@ -63,6 +64,7 @@ class TaskListActivity : val layoutManager = binding.baseRecyclerView.layoutManager as? LinearLayoutManager if (layoutManager != null) { val lastVisible = layoutManager.findLastVisibleItemPosition() + LogHelper.d("lastVisible:$lastVisible") if (lastVisible < adapter.itemCount) { layoutManager.scrollToPositionWithOffset(lastVisible, 0) } else { @@ -91,6 +93,9 @@ class TaskListActivity : 0 -> { startActivity(Intent(this@TaskListActivity, FoActivity::class.java)) } + 1 -> { + startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) + } } } } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/ItemListVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/ItemListVM.kt new file mode 100644 index 0000000..9f498e8 --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/ItemListVM.kt @@ -0,0 +1,18 @@ +package com.nova.brain.glass.viewmodel + +import com.nova.brain.glass.model.ItemItem +import com.nova.brain.glass.model.TaskItem +import com.xuqm.base.viewmodel.BaseListViewModel +import com.xuqm.base.viewmodel.callback.Response + +class ItemListVM: BaseListViewModel() { + override fun loadData( + page: Int, + onResponse: Response + ) { + onResponse.onResponse(arrayListOf().apply { + add(ItemItem("驳回")) + add(ItemItem("同意")) + }) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_item.xml b/app/src/main/res/drawable/bg_item.xml new file mode 100644 index 0000000..b852115 --- /dev/null +++ b/app/src/main/res/drawable/bg_item.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_normal.xml b/app/src/main/res/drawable/bg_normal.xml new file mode 100644 index 0000000..aaf1996 --- /dev/null +++ b/app/src/main/res/drawable/bg_normal.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_selected.xml b/app/src/main/res/drawable/bg_selected.xml new file mode 100644 index 0000000..6ac30e8 --- /dev/null +++ b/app/src/main/res/drawable/bg_selected.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_inspection.xml b/app/src/main/res/layout/activity_inspection.xml new file mode 100644 index 0000000..4af5ae2 --- /dev/null +++ b/app/src/main/res/layout/activity_inspection.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml new file mode 100644 index 0000000..2cb97e5 --- /dev/null +++ b/app/src/main/res/layout/activity_review.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_item.xml b/app/src/main/res/layout/item_item.xml new file mode 100644 index 0000000..2f1a1e7 --- /dev/null +++ b/app/src/main/res/layout/item_item.xml @@ -0,0 +1,11 @@ + + diff --git a/base/src/main/java/com/xuqm/base/ui/BaseListActivity.java b/base/src/main/java/com/xuqm/base/ui/BaseListActivity.java index a832818..784d24a 100644 --- a/base/src/main/java/com/xuqm/base/ui/BaseListActivity.java +++ b/base/src/main/java/com/xuqm/base/ui/BaseListActivity.java @@ -137,7 +137,7 @@ public abstract class BaseListActivity