From c4383052428cac34af88abb86eb5130a0e4605dc Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 10 Dec 2025 10:10:20 +0800 Subject: [PATCH] =?UTF-8?q?[8.3.0][=E7=AB=99=E7=82=B9=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E7=A6=81=E7=94=A8]=20=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AB=99=E7=82=B9=E6=A0=87=E5=BF=97=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=AB=99=E7=82=B9item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/data/bean/BusStationBean.kt | 7 +++++++ .../8.json | 13 ++++++++++--- .../weaknet/bean/response/BusRoutesResponse.kt | 1 + .../och/weaknet/repository/db/MyDataBase.kt | 3 ++- .../repository/db/bean/TaskSiteDataBean.kt | 6 ++++++ .../ui/taskrunning/TaskRunningAdapter.kt | 13 +++++++++++++ .../main/res/drawable/bus_station_status_bg.xml | 10 ++++++++++ .../shuttle_weak_running_station_list_item.xml | 17 +++++++++++++++++ 8 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_status_bg.xml diff --git a/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.kt b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.kt index bf1998a74e..6e97a39a84 100644 --- a/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.kt +++ b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.kt @@ -35,6 +35,10 @@ open class BusStationBean { var isPlayTts: Boolean = false var pointType: Int = 0 // 1:途径点 2:禁行点 3:站点 var videoList: List? = null + /** + * 站点标志 0：未赋值/默认值，与1结果一致 1：正常停靠 2：临时不停靠 + */ + var tag: Int = 0 var passPoints: List? = null // 用于算路的经停点 var blackPoints: List? = null // 用于算路的黑名單點 @@ -58,6 +62,7 @@ open class BusStationBean { && nameKr == that.nameKr && introduction == that.introduction && videoList == that.videoList + && tag == that.tag } override fun hashCode(): Int { @@ -75,6 +80,7 @@ open class BusStationBean { result = 31 * result + java.lang.Boolean.hashCode(isPlayTts) result = 31 * result + pointType result = 31 * result + Objects.hashCode(videoList) + result = 31 * result + tag return result } @@ -94,6 +100,7 @@ open class BusStationBean { ", isPlayTts=" + isPlayTts + ", pointType=" + pointType + ", videoList=" + videoList + + ", tag=" + tag + '}' } diff --git a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/8.json b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/8.json index c86f6751c1..e7a0f0b2ba 100644 --- a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/8.json +++ b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/8.json @@ -2,7 +2,7 @@ "formatVersion": 1, "database": { "version": 8, - "identityHash": "50810f785aa35be38cad3a202c2f809f", + "identityHash": "761be9c0c9726513939d5788d36c9c1d", "entities": [ { "tableName": "contrail_data_table", @@ -370,7 +370,7 @@ }, { "tableName": "used_task_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER, `shifts_id` INTEGER, `line_id` INTEGER, `site_id` INTEGER, `line_name` TEXT, `name` TEXT, `name_kr` TEXT, `seq` INTEGER, `gcj_lon` REAL, `gcj_lat` REAL, `lon` REAL, `lat` REAL, `driving_status` INTEGER, `leaving` INTEGER, `arrived_time` INTEGER, `leave_time` INTEGER, `introduction` TEXT, `is_play_tts` INTEGER, `event_save_time` INTEGER NOT NULL, `videoList` TEXT)", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER, `shifts_id` INTEGER, `line_id` INTEGER, `site_id` INTEGER, `line_name` TEXT, `name` TEXT, `name_kr` TEXT, `seq` INTEGER, `gcj_lon` REAL, `gcj_lat` REAL, `lon` REAL, `lat` REAL, `driving_status` INTEGER, `leaving` INTEGER, `arrived_time` INTEGER, `leave_time` INTEGER, `introduction` TEXT, `is_play_tts` INTEGER, `event_save_time` INTEGER NOT NULL, `videoList` TEXT, `tag` INTEGER NOT NULL DEFAULT 0)", "fields": [ { "fieldPath": "id", @@ -497,6 +497,13 @@ "columnName": "videoList", "affinity": "TEXT", "notNull": false + }, + { + "fieldPath": "tag", + "columnName": "tag", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" } ], "primaryKey": { @@ -862,7 +869,7 @@ "views": [], "setupQueries": [ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '50810f785aa35be38cad3a202c2f809f')" + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '761be9c0c9726513939d5788d36c9c1d')" ] } } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt index a4caacd8fb..79e003576f 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt @@ -55,6 +55,7 @@ class BusRoutesResponse : BaseData() { temp?.nameKr = taskAndsite.nameKr temp?.isPlayTts = Boolean.TRUE == taskAndsite.isPlayTts temp?.seq = (taskAndsite.seq ?: 0) + temp?.tag = taskAndsite.tag temp?.siteId = if (taskAndsite.siteId == null) 0 else taskAndsite.siteId!!.toInt() points?.let { pointList-> val sitePoint = pointList.filter { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index bf12f529b0..9600c89c27 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -124,7 +124,8 @@ abstract class MyDataBase : RoomDatabase() { if (dbFileName == "shuttle_db") { // 新增tag字段：int类型，非空，默认值0 db.execSQL("ALTER TABLE ${SiteDataBean.tableName} ADD COLUMN tag INTEGER NOT NULL DEFAULT 0") - CallerLogger.d(TAG, "shuttle_db：给${SiteDataBean.tableName}新增tag字段成功") + db.execSQL("ALTER TABLE ${TaskSiteDataBean.tableName} ADD COLUMN tag INTEGER NOT NULL DEFAULT 0") + CallerLogger.d(TAG, "shuttle_db：给${SiteDataBean.tableName}、${TaskSiteDataBean.tableName}新增tag字段成功") } else { CallerLogger.d(TAG, "非shuttle_db，跳过tag字段新增") } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt index 5b54354819..848e3b279d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt @@ -131,6 +131,11 @@ data class TaskSiteDataBean( @ColumnInfo(name = "videoList", typeAffinity = ColumnInfo.TEXT) var videoList: String? = null, + /** + * 站点标志 0：未赋值/默认值，与1结果一致 1：正常停靠 2：临时不停靠 + */ + @ColumnInfo(name = "tag", typeAffinity = ColumnInfo.INTEGER, defaultValue = "0") + var tag: Int = 0, ) { companion object { /** @@ -162,6 +167,7 @@ data class TaskSiteDataBean( temp?.introduction = it.introduction temp?.isPlayTts = it.isPlayTts temp?.videoList = it.videoListDB + temp?.tag = it.tag result.add(temp!!) } return result diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt index bc6ec819a7..33dc0c5ae0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt @@ -101,6 +101,18 @@ class TaskRunningAdapter( holder.actvWriteOffCount.visibility = View.GONE holder.acivStationHead.setImageResource(R.drawable.bus_runnint_task_middle) } + holder.stationStatus.visibility = if (line.tag == 2) { + holder.actvStationName.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + AutoSizeUtils.dp2px(mContext, 40f).toFloat() + ) + holder.actvStationName.setTextColor(ResourcesUtils.getColor(R.color.bus_color_4dffffff)) + holder.actvWriteOffCount.visibility = View.GONE + holder.acivStationHead.setImageResource(R.drawable.bus_switch_line_adapter_point_pass) + View.VISIBLE + }else{ + View.GONE + } when (currentPosition) { 0 -> { @@ -256,6 +268,7 @@ class TaskRunningAdapter( val actvStationName: AppCompatTextView = itemView.findViewById(R.id.actv_station_name)//站点名称 val acivStationHead: AppCompatImageView = itemView.findViewById(R.id.aciv_station_head)//普通站点标识 不是起始和终点坐标 + val stationStatus: AppCompatTextView = itemView.findViewById(R.id.station_status)//站点状态 val acivStationHeadBig: AppCompatImageView = itemView.findViewById(R.id.aciv_station_head_big)//起始和终点坐标标识 val actvWriteOffCount: WriteOffView = diff --git a/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_status_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_status_bg.xml new file mode 100644 index 0000000000..00cb71672e --- /dev/null +++ b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_status_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml index 6b9778f703..8832b6dc05 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_running_station_list_item.xml @@ -87,5 +87,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + \ No newline at end of file