diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt index b9186e6..68260b2 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.CheckBox +import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder @@ -116,17 +117,11 @@ .setText(R.id.pathLengthView, km) .setText(R.id.taskStateView, taskState) - //item背景色 - if (position % 2 == 0) { - holder.setBackgroundColor(R.id.rootView, Color.parseColor("#EEF1F6")) - } - //多选 - val multiSelectCheckBox: CheckBox = - holder.itemView.findViewById(R.id.multiSelectCheckBox) + val multiCheckBox: CheckBox = holder.itemView.findViewById(R.id.multiSelectCheckBox) - multiSelectCheckBox.isSelected = multipleSelected.contains(position) - multiSelectCheckBox.setOnClickListener { + multiCheckBox.isSelected = multipleSelected.contains(position) + multiCheckBox.setOnClickListener { if (multipleSelected.contains(position)) { multipleSelected.remove(position) selectedItems.remove(dataRows[position]) @@ -147,6 +142,11 @@ .setText(R.id.pathLengthView, "巡检公里") .setText(R.id.taskStateView, "巡检状态") } + //item背景色 + if (position % 2 == 0) { + val linearLayout = holder.itemView.findViewById(R.id.rootView) + linearLayout.setBackgroundColor(Color.parseColor("#EEF1F6")) + } } private var itemCheckedListener: OnItemCheckedListener? = null diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt index b9186e6..68260b2 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.CheckBox +import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder @@ -116,17 +117,11 @@ .setText(R.id.pathLengthView, km) .setText(R.id.taskStateView, taskState) - //item背景色 - if (position % 2 == 0) { - holder.setBackgroundColor(R.id.rootView, Color.parseColor("#EEF1F6")) - } - //多选 - val multiSelectCheckBox: CheckBox = - holder.itemView.findViewById(R.id.multiSelectCheckBox) + val multiCheckBox: CheckBox = holder.itemView.findViewById(R.id.multiSelectCheckBox) - multiSelectCheckBox.isSelected = multipleSelected.contains(position) - multiSelectCheckBox.setOnClickListener { + multiCheckBox.isSelected = multipleSelected.contains(position) + multiCheckBox.setOnClickListener { if (multipleSelected.contains(position)) { multipleSelected.remove(position) selectedItems.remove(dataRows[position]) @@ -147,6 +142,11 @@ .setText(R.id.pathLengthView, "巡检公里") .setText(R.id.taskStateView, "巡检状态") } + //item背景色 + if (position % 2 == 0) { + val linearLayout = holder.itemView.findViewById(R.id.rootView) + linearLayout.setBackgroundColor(Color.parseColor("#EEF1F6")) + } } private var itemCheckedListener: OnItemCheckedListener? = null diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index f9ecda6..50bdc7c 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -90,7 +90,10 @@ 2023070501 -> { if (dataBeans.size == 0) { bv.taskLayout.visibility = View.GONE + bv.emptyLayout.visibility = View.VISIBLE } else { + bv.taskLayout.visibility = View.VISIBLE + bv.emptyLayout.visibility = View.GONE taskAdapter = TaskAdapter(requireContext(), dataBeans) //绑定侧滑事件 swipeAction.attachToRecyclerView(bv.taskRecyclerView) diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt index b9186e6..68260b2 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.CheckBox +import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder @@ -116,17 +117,11 @@ .setText(R.id.pathLengthView, km) .setText(R.id.taskStateView, taskState) - //item背景色 - if (position % 2 == 0) { - holder.setBackgroundColor(R.id.rootView, Color.parseColor("#EEF1F6")) - } - //多选 - val multiSelectCheckBox: CheckBox = - holder.itemView.findViewById(R.id.multiSelectCheckBox) + val multiCheckBox: CheckBox = holder.itemView.findViewById(R.id.multiSelectCheckBox) - multiSelectCheckBox.isSelected = multipleSelected.contains(position) - multiSelectCheckBox.setOnClickListener { + multiCheckBox.isSelected = multipleSelected.contains(position) + multiCheckBox.setOnClickListener { if (multipleSelected.contains(position)) { multipleSelected.remove(position) selectedItems.remove(dataRows[position]) @@ -147,6 +142,11 @@ .setText(R.id.pathLengthView, "巡检公里") .setText(R.id.taskStateView, "巡检状态") } + //item背景色 + if (position % 2 == 0) { + val linearLayout = holder.itemView.findViewById(R.id.rootView) + linearLayout.setBackgroundColor(Color.parseColor("#EEF1F6")) + } } private var itemCheckedListener: OnItemCheckedListener? = null diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index f9ecda6..50bdc7c 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -90,7 +90,10 @@ 2023070501 -> { if (dataBeans.size == 0) { bv.taskLayout.visibility = View.GONE + bv.emptyLayout.visibility = View.VISIBLE } else { + bv.taskLayout.visibility = View.VISIBLE + bv.emptyLayout.visibility = View.GONE taskAdapter = TaskAdapter(requireContext(), dataBeans) //绑定侧滑事件 swipeAction.attachToRecyclerView(bv.taskRecyclerView) diff --git a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt index e4bd2b4..bb863cd 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt @@ -8,6 +8,7 @@ import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel @@ -31,6 +32,10 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - "网络连接失败,请检查网络".show(BaseApplication.get()) + if (!BaseApplication.get().isNetworkConnected()) { + "网络连接失败,请检查网络".show(BaseApplication.get()) + } else { + "无法连接到服务器,请联系管理员".show(BaseApplication.get()) + } }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt index b9186e6..68260b2 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.CheckBox +import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder @@ -116,17 +117,11 @@ .setText(R.id.pathLengthView, km) .setText(R.id.taskStateView, taskState) - //item背景色 - if (position % 2 == 0) { - holder.setBackgroundColor(R.id.rootView, Color.parseColor("#EEF1F6")) - } - //多选 - val multiSelectCheckBox: CheckBox = - holder.itemView.findViewById(R.id.multiSelectCheckBox) + val multiCheckBox: CheckBox = holder.itemView.findViewById(R.id.multiSelectCheckBox) - multiSelectCheckBox.isSelected = multipleSelected.contains(position) - multiSelectCheckBox.setOnClickListener { + multiCheckBox.isSelected = multipleSelected.contains(position) + multiCheckBox.setOnClickListener { if (multipleSelected.contains(position)) { multipleSelected.remove(position) selectedItems.remove(dataRows[position]) @@ -147,6 +142,11 @@ .setText(R.id.pathLengthView, "巡检公里") .setText(R.id.taskStateView, "巡检状态") } + //item背景色 + if (position % 2 == 0) { + val linearLayout = holder.itemView.findViewById(R.id.rootView) + linearLayout.setBackgroundColor(Color.parseColor("#EEF1F6")) + } } private var itemCheckedListener: OnItemCheckedListener? = null diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index f9ecda6..50bdc7c 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -90,7 +90,10 @@ 2023070501 -> { if (dataBeans.size == 0) { bv.taskLayout.visibility = View.GONE + bv.emptyLayout.visibility = View.VISIBLE } else { + bv.taskLayout.visibility = View.VISIBLE + bv.emptyLayout.visibility = View.GONE taskAdapter = TaskAdapter(requireContext(), dataBeans) //绑定侧滑事件 swipeAction.attachToRecyclerView(bv.taskRecyclerView) diff --git a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt index e4bd2b4..bb863cd 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt @@ -8,6 +8,7 @@ import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel @@ -31,6 +32,10 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - "网络连接失败,请检查网络".show(BaseApplication.get()) + if (!BaseApplication.get().isNetworkConnected()) { + "网络连接失败,请检查网络".show(BaseApplication.get()) + } else { + "无法连接到服务器,请联系管理员".show(BaseApplication.get()) + } }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml index 524886d..e52ea4b 100644 --- a/app/src/main/res/layout/fragment_task.xml +++ b/app/src/main/res/layout/fragment_task.xml @@ -164,7 +164,9 @@ android:layout_height="wrap_content" /> - + \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt index b9186e6..68260b2 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.CheckBox +import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder @@ -116,17 +117,11 @@ .setText(R.id.pathLengthView, km) .setText(R.id.taskStateView, taskState) - //item背景色 - if (position % 2 == 0) { - holder.setBackgroundColor(R.id.rootView, Color.parseColor("#EEF1F6")) - } - //多选 - val multiSelectCheckBox: CheckBox = - holder.itemView.findViewById(R.id.multiSelectCheckBox) + val multiCheckBox: CheckBox = holder.itemView.findViewById(R.id.multiSelectCheckBox) - multiSelectCheckBox.isSelected = multipleSelected.contains(position) - multiSelectCheckBox.setOnClickListener { + multiCheckBox.isSelected = multipleSelected.contains(position) + multiCheckBox.setOnClickListener { if (multipleSelected.contains(position)) { multipleSelected.remove(position) selectedItems.remove(dataRows[position]) @@ -147,6 +142,11 @@ .setText(R.id.pathLengthView, "巡检公里") .setText(R.id.taskStateView, "巡检状态") } + //item背景色 + if (position % 2 == 0) { + val linearLayout = holder.itemView.findViewById(R.id.rootView) + linearLayout.setBackgroundColor(Color.parseColor("#EEF1F6")) + } } private var itemCheckedListener: OnItemCheckedListener? = null diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index f9ecda6..50bdc7c 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -90,7 +90,10 @@ 2023070501 -> { if (dataBeans.size == 0) { bv.taskLayout.visibility = View.GONE + bv.emptyLayout.visibility = View.VISIBLE } else { + bv.taskLayout.visibility = View.VISIBLE + bv.emptyLayout.visibility = View.GONE taskAdapter = TaskAdapter(requireContext(), dataBeans) //绑定侧滑事件 swipeAction.attachToRecyclerView(bv.taskRecyclerView) diff --git a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt index e4bd2b4..bb863cd 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/AuthenticateViewModel.kt @@ -8,6 +8,7 @@ import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel @@ -31,6 +32,10 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - "网络连接失败,请检查网络".show(BaseApplication.get()) + if (!BaseApplication.get().isNetworkConnected()) { + "网络连接失败,请检查网络".show(BaseApplication.get()) + } else { + "无法连接到服务器,请联系管理员".show(BaseApplication.get()) + } }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml index 524886d..e52ea4b 100644 --- a/app/src/main/res/layout/fragment_task.xml +++ b/app/src/main/res/layout/fragment_task.xml @@ -164,7 +164,9 @@ android:layout_height="wrap_content" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_task_rv_l_title.xml b/app/src/main/res/layout/item_task_rv_l_title.xml index 782d77d..5df9726 100644 --- a/app/src/main/res/layout/item_task_rv_l_title.xml +++ b/app/src/main/res/layout/item_task_rv_l_title.xml @@ -1,8 +1,8 @@