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 index 7437e08..8893d46 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt @@ -1,16 +1,23 @@ package com.nova.brain.glass.ui +import androidx.recyclerview.widget.RecyclerView import com.nova.brain.glass.R -import com.nova.brain.glass.databinding.ActivityFoBinding import com.nova.brain.glass.databinding.ActivityInspectionBinding -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 +import com.nova.brain.glass.model.ItemItem +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.BaseListFormLayoutNormalActivity -class InspectionActivity : BaseActivity() { +class InspectionActivity : BaseListFormLayoutNormalActivity() { override fun getLayoutId(): Int =R.layout.activity_inspection override fun fullscreen(): Boolean = true + + override fun getRecyclerOrientation(): Int = RecyclerView.HORIZONTAL + private val listener = object : OfflineCmdListener { override fun onOfflineCmd(cmd: String) { runOnUiThread { @@ -18,6 +25,12 @@ class InspectionActivity : BaseActivity() { "退出","返回","退回"->{ finish() } + "驳回","拒绝","不同意"->{ + finish() + } + "同意","通过"->{ + finish() + } } } } @@ -31,4 +44,19 @@ class InspectionActivity : BaseActivity() { 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 } diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt index 162ee15..2a5a356 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt @@ -1,15 +1,24 @@ package com.nova.brain.glass.ui +import androidx.recyclerview.widget.RecyclerView import com.nova.brain.glass.R import com.nova.brain.glass.databinding.ActivitySprayingBinding import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper -import com.xuqm.base.ui.BaseActivity +import com.nova.brain.glass.model.ItemItem +import com.nova.brain.glass.viewmodel.ItemListVM +import com.nova.brain.glass.viewmodel.SprayingVM +import com.xuqm.base.adapter.BasePagedAdapter +import com.xuqm.base.adapter.CommonPagedAdapter +import com.xuqm.base.adapter.ViewHolder +import com.xuqm.base.ui.BaseListFormLayoutNormalActivity -class SprayingActivity : BaseActivity() { +class SprayingActivity : BaseListFormLayoutNormalActivity() { override fun getLayoutId(): Int = R.layout.activity_spraying override fun fullscreen(): Boolean = true + override fun getRecyclerOrientation(): Int = RecyclerView.HORIZONTAL + private val listener = object : OfflineCmdListener { override fun onOfflineCmd(cmd: String) { runOnUiThread { @@ -31,4 +40,19 @@ class SprayingActivity : BaseActivity() { super.onDestroy() OfflineCmdServiceHelper.removeOnLineListener(listener) } + + private val adapter = object : CommonPagedAdapter(R.layout.item_photo) { + override fun convert(holder: ViewHolder, item: ItemItem, position: Int) { + holder + .setClickListener(R.id.photo) { + when (item.text) { + "拍照" -> { + + } + } + } + } + } + + override fun adapter(): BasePagedAdapter = adapter } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionVM.kt new file mode 100644 index 0000000..c0a891f --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/InspectionVM.kt @@ -0,0 +1,17 @@ +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 InspectionVM: BaseListViewModel() { + override fun loadData( + page: Int, + onResponse: Response + ) { + onResponse.onResponse(arrayListOf().apply { + add(ItemItem("拍照")) + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt new file mode 100644 index 0000000..52b3d96 --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt @@ -0,0 +1,16 @@ +package com.nova.brain.glass.viewmodel + +import com.nova.brain.glass.model.ItemItem +import com.xuqm.base.viewmodel.BaseListViewModel +import com.xuqm.base.viewmodel.callback.Response + +class SprayingVM: BaseListViewModel() { + override fun loadData( + page: Int, + onResponse: Response + ) { + onResponse.onResponse(arrayListOf().apply { + add(ItemItem("拍照")) + }) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_photo.xml b/app/src/main/res/drawable/bg_photo.xml new file mode 100644 index 0000000..a6b8907 --- /dev/null +++ b/app/src/main/res/drawable/bg_photo.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_task_title_selected.xml b/app/src/main/res/drawable/bg_task_title_selected.xml index aaf1996..64a02c5 100644 --- a/app/src/main/res/drawable/bg_task_title_selected.xml +++ b/app/src/main/res/drawable/bg_task_title_selected.xml @@ -1,7 +1,6 @@ - diff --git a/app/src/main/res/layout/activity_inspection.xml b/app/src/main/res/layout/activity_inspection.xml index 4af5ae2..2742c21 100644 --- a/app/src/main/res/layout/activity_inspection.xml +++ b/app/src/main/res/layout/activity_inspection.xml @@ -1,8 +1,8 @@ + - + app:layout_constraintTop_toBottomOf="@+id/tvTaskHeader"> - + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/content" /> + android:textSize="14sp"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_spraying.xml b/app/src/main/res/layout/activity_spraying.xml index 69e9e11..2742c21 100644 --- a/app/src/main/res/layout/activity_spraying.xml +++ b/app/src/main/res/layout/activity_spraying.xml @@ -1,5 +1,6 @@ + - + app:layout_constraintTop_toBottomOf="@+id/tvTaskHeader"> - + + + + + + + + + + + + - + app:layout_constraintTop_toBottomOf="@id/content" /> + android:textSize="14sp"/> diff --git a/app/src/main/res/layout/item_photo.xml b/app/src/main/res/layout/item_photo.xml new file mode 100644 index 0000000..22c329e --- /dev/null +++ b/app/src/main/res/layout/item_photo.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/paizhao.png b/app/src/main/res/mipmap-hdpi/paizhao.png new file mode 100644 index 0000000..49d651a Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/paizhao.png differ diff --git a/app/src/main/res/mipmap-mdpi/paizhao.png b/app/src/main/res/mipmap-mdpi/paizhao.png new file mode 100644 index 0000000..6e8cd6d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/paizhao.png differ diff --git a/app/src/main/res/mipmap-xhdpi/paizhao.png b/app/src/main/res/mipmap-xhdpi/paizhao.png new file mode 100644 index 0000000..98f4040 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/paizhao.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/paizhao.png b/app/src/main/res/mipmap-xxhdpi/paizhao.png new file mode 100644 index 0000000..51f8ff7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/paizhao.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/paizhao.png b/app/src/main/res/mipmap-xxxhdpi/paizhao.png new file mode 100644 index 0000000..e374c3c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/paizhao.png differ