18034727885
2026-05-21 6b3462d6d2f288ffcc82bbf24fed20a208901af8
修复问题
8个文件已修改
60 ■■■■■ 已修改文件
app/src/main/java/com/xw/yunwei/ui/work/checkInMission/CruiseCheckInActivity.kt 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/xw/yunwei/ui/work/checkInMission/adapter/CheckInMissionPointAdapter.kt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_cruise_check_in.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_route_planning.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_apply_for_reassign_reason.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xhdpi/ic_end_point.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xhdpi/ic_pass_point.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/mipmap-xhdpi/ic_start_point.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/xw/yunwei/ui/work/checkInMission/CruiseCheckInActivity.kt
@@ -238,13 +238,13 @@
            binding.tvFloatCheckIn.setBackgroundResource(if (it) R.drawable.shape_blue_5_bg_4 else R.drawable.shape_gray_4_bg_4)
        }
        viewModel.checkInOperationInfo.observe(this) {
            viewModel.couldCheckIn.postValue(it.isLocationInCheckInRange())
            if (!it.isEffective()) {
                binding.llTimeoutNotice.visibility = View.GONE
                binding.slFloatNotice.visibility = View.GONE
                return@observe
            }
            viewModel.getNextPoint()?.also { nextPoint ->
                viewModel.couldCheckIn.postValue(it.isLocationInCheckInRange())
                if (!it.isEffective()) {
                    binding.llTimeoutNotice.visibility = View.GONE
                    binding.slFloatNotice.visibility = View.GONE
                    return@observe
                }
                binding.tvTime.text = nextPoint.time
                binding.tvAddress.text = nextPoint.address
app/src/main/java/com/xw/yunwei/ui/work/checkInMission/adapter/CheckInMissionPointAdapter.kt
@@ -2,6 +2,7 @@
import android.content.Context
import android.graphics.Color
import android.view.View
import androidx.core.content.ContextCompat
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
@@ -35,6 +36,7 @@
                if (item.hadCheckIn()) R.drawable.circle_blue_5 else R.drawable.circle_gray_6
            )
        val lvLine = holder.getView<LineView>(R.id.lv_line)
        lvLine.visibility = if (item == data.last()) View.INVISIBLE else View.VISIBLE
        lvLine.dashLineEnable = !item.hadCheckIn()
        lvLine.lineColor = ContextCompat.getColor(
            holder.itemView.context,
app/src/main/res/layout/activity_cruise_check_in.xml
@@ -129,14 +129,21 @@
                            android:textSize="@dimen/sp_16" />
                    </LinearLayout>
                    <TextView
                        android:id="@+id/tv_check_in_notice"
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:gravity="end"
                        android:text="未进入打卡范围"
                        android:textColor="@color/red_5"
                        android:textSize="@dimen/sp_11" />
                        android:orientation="horizontal">
                        <TextView
                            android:id="@+id/tv_check_in_notice"
                            android:layout_width="@dimen/dp_120"
                            android:layout_height="wrap_content"
                            android:gravity="center"
                            android:text="未进入打卡范围"
                            android:textColor="@color/red_5"
                            android:textSize="@dimen/sp_11" />
                    </LinearLayout>
                    <TextView
                        android:layout_width="wrap_content"
@@ -256,9 +263,9 @@
            <LinearLayout
                android:id="@+id/ll_click_location_info"
                android:layout_width="0dp"
                android:background="@drawable/shape_white_bg_top_12"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_85"
                android:background="@drawable/shape_white_bg_top_12"
                android:orientation="vertical"
                android:padding="@dimen/dp_20"
                android:visibility="gone"
@@ -342,14 +349,21 @@
                        android:textSize="@dimen/sp_16" />
                </LinearLayout>
                <TextView
                    android:id="@+id/tv_click_location_check_in_notice"
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:gravity="end"
                    android:text="未进入打卡范围"
                    android:textColor="@color/red_5"
                    android:textSize="@dimen/sp_11" />
                    android:orientation="horizontal">
                    <TextView
                        android:id="@+id/tv_click_location_check_in_notice"
                        android:layout_width="@dimen/dp_120"
                        android:layout_height="wrap_content"
                        android:gravity="center_horizontal"
                        android:text="未进入打卡范围"
                        android:textColor="@color/red_5"
                        android:textSize="@dimen/sp_11" />
                </LinearLayout>
                <TextView
                    android:layout_width="wrap_content"
@@ -392,8 +406,7 @@
                app:hl_shadowLimit="@dimen/dp_8"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                tools:visibility="visible">
                app:layout_constraintStart_toStartOf="parent">
                <LinearLayout
                    android:layout_width="match_parent"
app/src/main/res/layout/activity_route_planning.xml
@@ -222,7 +222,7 @@
                    android:layout_marginHorizontal="@dimen/dp_20"
                    android:layout_marginVertical="@dimen/dp_12"
                    android:background="@drawable/shape_blue_5_bg_4"
                    android:text="路径规划"
                    android:text="开始导航"
                    android:textSize="@dimen/sp_16"
                    android:textStyle="bold"
                    app:cornerRadius="@dimen/dp_4" />
app/src/main/res/layout/dialog_apply_for_reassign_reason.xml
@@ -45,6 +45,11 @@
        android:textColorLink="@color/gray_6"
        android:textSize="@dimen/sp_14" />
    <View
        android:layout_width="match_parent"
        android:layout_height="1px"
        android:background="@color/gray_4" />
    <TextView
        android:id="@+id/tv_operation"
        android:layout_width="match_parent"
app/src/main/res/mipmap-xhdpi/ic_end_point.png

app/src/main/res/mipmap-xhdpi/ic_pass_point.png

app/src/main/res/mipmap-xhdpi/ic_start_point.png