From 1b77f4ef5d85e83a9bed4294db067842a05896d7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 18 Sep 2024 15:16:02 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[db=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=8C=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.json | 571 ------------------ .../2.json | 0 .../mogo/och/weaknet/ShuttleDriverProvider.kt | 8 +- .../bean/BusQueryLineTaskResponse.java | 7 - .../weaknet/bean/BusQueryLinesResponse.java | 5 - .../och/weaknet/bean/BusRoutesResponse.kt | 4 +- .../weaknet/bean/CarExecutableTaskResponse.kt | 16 +- .../och/weaknet/bean/ShuttleEventRequest.kt | 3 +- .../weaknet/callback/IBusLinesCallback.java | 5 - .../mogo/och/weaknet/model/BusLineModel.kt | 39 +- .../com/mogo/och/weaknet/model/EventModel.kt | 5 +- .../{database => repository/db}/MyDataBase.kt | 26 +- .../db}/bean/ContrailDataBean.kt | 2 +- .../db}/bean/EventDataBean.kt | 2 +- .../db}/bean/LineDataBean.kt | 2 +- .../db}/bean/SiteDataBean.kt | 2 +- .../db}/bean/TaskDataBean.kt | 2 +- .../db}/bean/TaskSiteDataBean.kt | 2 +- .../db}/dao/ContrailDataDao.kt | 4 +- .../db}/dao/EventDataDao.kt | 4 +- .../db}/dao/LineDataDao.kt | 4 +- .../db}/dao/SiteDataDao.kt | 4 +- .../db}/dao/TaskDataDao.kt | 5 +- .../db}/dao/TaskSiteDataDao.kt | 4 +- .../db}/exception/DataException.kt | 2 +- .../db}/repository/ContraiRepository.kt | 9 +- .../db}/repository/DbThreadUtils.kt | 2 +- .../db}/repository/EventRepository.kt | 8 +- .../db}/repository/LineRepository.kt | 8 +- .../db}/repository/SiteRepository.kt | 9 +- .../db}/repository/TaskRepository.kt | 10 +- .../db}/repository/TaskSiteRepository.kt | 10 +- .../db}/transform/DataBaseTransform.kt | 15 +- .../weaknet/ui/bizswitch/SwtichBizeModel.kt | 2 - 34 files changed, 94 insertions(+), 707 deletions(-) delete mode 100644 OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/1.json rename OCH/shuttle/driver_weaknet/schemas/{com.mogo.och.weaknet.database.MyDataBase => com.mogo.och.weaknet.repository.db.MyDataBase}/2.json (100%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/MyDataBase.kt (73%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/ContrailDataBean.kt (98%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/EventDataBean.kt (98%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/LineDataBean.kt (96%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/SiteDataBean.kt (97%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/TaskDataBean.kt (97%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/bean/TaskSiteDataBean.kt (98%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/ContrailDataDao.kt (91%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/EventDataDao.kt (93%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/LineDataDao.kt (93%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/SiteDataDao.kt (92%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/TaskDataDao.kt (95%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/dao/TaskSiteDataDao.kt (92%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/exception/DataException.kt (69%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/ContraiRepository.kt (87%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/DbThreadUtils.kt (83%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/EventRepository.kt (95%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/LineRepository.kt (93%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/SiteRepository.kt (84%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/TaskRepository.kt (95%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/repository/TaskSiteRepository.kt (90%) rename OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/{database => repository/db}/transform/DataBaseTransform.kt (71%) diff --git a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/1.json b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/1.json deleted file mode 100644 index e8140c506b..0000000000 --- a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/1.json +++ /dev/null @@ -1,571 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "2a452358f8c0aca67794fd0de6b4af1c", - "entities": [ - { - "tableName": "contrail_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `line_id` INTEGER, `csv_file_url` TEXT, `csv_file_md5` TEXT, `txt_file_url` TEXT, `txt_file_md5` TEXT, `contrail_save_time` INTEGER, `md5` TEXT)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lineId", - "columnName": "line_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "csvFileUrl", - "columnName": "csv_file_url", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "csvFileMd5", - "columnName": "csv_file_md5", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "txtFileUrl", - "columnName": "txt_file_url", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "txtFileMd5", - "columnName": "txt_file_md5", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "contrailSaveTime", - "columnName": "contrail_save_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "md5", - "columnName": "md5", - "affinity": "TEXT", - "notNull": false - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_contrail_data_table_line_id", - "unique": false, - "columnNames": [ - "line_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_contrail_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" - }, - { - "name": "index_contrail_data_table_md5", - "unique": false, - "columnNames": [ - "md5" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_contrail_data_table_md5` ON `${TABLE_NAME}` (`md5`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "line_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `line_id` INTEGER, `line_name` TEXT, `end_station_name` TEXT, `line_get_time` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lineId", - "columnName": "line_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineName", - "columnName": "line_name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "endStationName", - "columnName": "end_station_name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "linegetTime", - "columnName": "line_get_time", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_line_data_table_line_id", - "unique": false, - "columnNames": [ - "line_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_line_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "site_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `site_id` INTEGER, `line_id` INTEGER, `name` TEXT, `name_kr` TEXT, `seq` INTEGER, `gcj_lon` REAL, `gcj_lat` REAL, `lon` REAL, `lat` REAL, `introduction` TEXT, `is_play_tts` INTEGER, `md5` TEXT)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "siteId", - "columnName": "site_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineId", - "columnName": "line_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "nameKr", - "columnName": "name_kr", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "seq", - "columnName": "seq", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "gcjLon", - "columnName": "gcj_lon", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "gcjLat", - "columnName": "gcj_lat", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "lon", - "columnName": "lon", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "lat", - "columnName": "lat", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "introduction", - "columnName": "introduction", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "isPlayTts", - "columnName": "is_play_tts", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "md5", - "columnName": "md5", - "affinity": "TEXT", - "notNull": false - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_site_data_table_site_id", - "unique": false, - "columnNames": [ - "site_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_site_data_table_site_id` ON `${TABLE_NAME}` (`site_id`)" - }, - { - "name": "index_site_data_table_line_id", - "unique": false, - "columnNames": [ - "line_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_site_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "task_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER, `line_id` INTEGER, `task_data` INTEGER, `task_start_time` INTEGER, `start_time` INTEGER, `end_time` INTEGER, `task_get_time` INTEGER NOT NULL, `status` INTEGER)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "taskId", - "columnName": "task_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineId", - "columnName": "line_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "taskDate", - "columnName": "task_data", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "taskStartTime", - "columnName": "task_start_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "startTime", - "columnName": "start_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "endtime", - "columnName": "end_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "taskgetTime", - "columnName": "task_get_time", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "INTEGER", - "notNull": false - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_task_data_table_task_id", - "unique": false, - "columnNames": [ - "task_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_task_data_table_task_id` ON `${TABLE_NAME}` (`task_id`)" - }, - { - "name": "index_task_data_table_line_id", - "unique": false, - "columnNames": [ - "line_id" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_task_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "used_task_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_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)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "taskId", - "columnName": "task_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineId", - "columnName": "line_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "siteId", - "columnName": "site_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineName", - "columnName": "line_name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "nameKr", - "columnName": "name_kr", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "seq", - "columnName": "seq", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "gcjLon", - "columnName": "gcj_lon", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "gcjLat", - "columnName": "gcj_lat", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "lon", - "columnName": "lon", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "lat", - "columnName": "lat", - "affinity": "REAL", - "notNull": false - }, - { - "fieldPath": "drivingStatus", - "columnName": "driving_status", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "leaving", - "columnName": "leaving", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "arrivedTime", - "columnName": "arrived_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "leaveTime", - "columnName": "leave_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "introduction", - "columnName": "introduction", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "isPlayTts", - "columnName": "is_play_tts", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "eventSaveTime", - "columnName": "event_save_time", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "event_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT, `lineId` INTEGER, `lineName` TEXT, `task_id` INTEGER, `task_start_time` INTEGER, `business_time` INTEGER, `write_version` INTEGER, `site_id` INTEGER, `seq` INTEGER, `event_save_time` INTEGER NOT NULL, `update_status` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "eventType", - "columnName": "event_type", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "lineId", - "columnName": "lineId", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lineName", - "columnName": "lineName", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "taskId", - "columnName": "task_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "taskStartTime", - "columnName": "task_start_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "businessTime", - "columnName": "business_time", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "writeVersion", - "columnName": "write_version", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "siteId", - "columnName": "site_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "seq", - "columnName": "seq", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "eventSaveTime", - "columnName": "event_save_time", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "updateStatus", - "columnName": "update_status", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_event_data_table_event_save_time", - "unique": false, - "columnNames": [ - "event_save_time" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_event_data_table_event_save_time` ON `${TABLE_NAME}` (`event_save_time`)" - } - ], - "foreignKeys": [] - } - ], - "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, '2a452358f8c0aca67794fd0de6b4af1c')" - ] - } -} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/2.json b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/2.json similarity index 100% rename from OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.database.MyDataBase/2.json rename to OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/2.json diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt index d86abf8bd9..41643c923d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt @@ -9,10 +9,10 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics -import com.mogo.och.weaknet.database.repository.EventRepository -import com.mogo.och.weaknet.database.repository.LineRepository -import com.mogo.och.weaknet.database.repository.TaskRepository -import com.mogo.och.weaknet.database.repository.TaskSiteRepository +import com.mogo.och.weaknet.repository.db.repository.EventRepository +import com.mogo.och.weaknet.repository.db.repository.LineRepository +import com.mogo.och.weaknet.repository.db.repository.TaskRepository +import com.mogo.och.weaknet.repository.db.repository.TaskSiteRepository import com.mogo.och.weaknet.fragment.ShuttleFragment import com.mogo.och.weaknet.model.BusLineModel import com.mogo.och.weaknet.util.BusAnalyticsManager diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java index 3e4124a352..695944d33b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java @@ -1,14 +1,7 @@ package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.common.module.utils.DateTimeUtil; -import com.mogo.och.weaknet.database.bean.LineDataBean; -import com.mogo.och.weaknet.database.bean.TaskDataBean; -import com.mogo.och.weaknet.database.repository.TaskRepository; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; import java.util.List; /** diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java index b6ae1fd77c..64de48c1e3 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java @@ -1,12 +1,7 @@ package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.weaknet.database.bean.LineDataBean; -import com.mogo.och.weaknet.database.repository.LineRepository; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; import java.util.List; /** diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt index 87a0e988fa..92f55a4742 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt @@ -5,9 +5,9 @@ import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.LineInfo -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean -import com.mogo.och.weaknet.database.repository.TaskSiteRepository import com.mogo.och.weaknet.model.BusLineModel +import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.repository.TaskSiteRepository import java.lang.Boolean import kotlin.String diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/CarExecutableTaskResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/CarExecutableTaskResponse.kt index c6f233a517..b7c0609323 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/CarExecutableTaskResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/CarExecutableTaskResponse.kt @@ -1,14 +1,14 @@ package com.mogo.och.weaknet.bean import com.mogo.eagle.core.data.BaseData -import com.mogo.och.weaknet.database.bean.ContrailDataBean -import com.mogo.och.weaknet.database.bean.LineDataBean -import com.mogo.och.weaknet.database.bean.SiteDataBean -import com.mogo.och.weaknet.database.bean.TaskDataBean -import com.mogo.och.weaknet.database.repository.ContraiRepository -import com.mogo.och.weaknet.database.repository.LineRepository -import com.mogo.och.weaknet.database.repository.SiteRepository -import com.mogo.och.weaknet.database.repository.TaskRepository +import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import com.mogo.och.weaknet.repository.db.repository.ContraiRepository +import com.mogo.och.weaknet.repository.db.repository.LineRepository +import com.mogo.och.weaknet.repository.db.repository.SiteRepository +import com.mogo.och.weaknet.repository.db.repository.TaskRepository /** * diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt index 1ea029ba2e..89371fdf3c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/ShuttleEventRequest.kt @@ -2,8 +2,7 @@ package com.mogo.och.weaknet.bean import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.network.utils.digest.DigestUtils -import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.weaknet.database.bean.EventDataBean +import com.mogo.och.weaknet.repository.db.bean.EventDataBean /** * @author congtaowang diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java index 7c8303e725..704e84deef 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java @@ -1,12 +1,7 @@ package com.mogo.och.weaknet.callback; -import com.mogo.och.data.bean.BusStationBean; import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse; import com.mogo.och.weaknet.bean.BusQueryLinesResponse; -import com.mogo.och.weaknet.database.bean.TaskDataBean; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt index c5f593e5d5..6ac839d90b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt @@ -6,27 +6,19 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager -import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager import com.mogo.eagle.core.network.utils.digest.DigestUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS -import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager -import com.mogo.och.common.module.manager.socket.lan.LanSocketManager -import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType -import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.ResourcesUtils -import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.data.bean.BusStationBean -import com.mogo.och.data.bean.BusTransferData import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse import com.mogo.och.weaknet.bean.BusQueryLinesResponse @@ -34,18 +26,17 @@ import com.mogo.och.weaknet.bean.BusRoutesResponse import com.mogo.och.weaknet.bean.CarExecutableTaskResponse import com.mogo.och.weaknet.callback.IBusLinesCallback import com.mogo.och.weaknet.constant.BusConst -import com.mogo.och.weaknet.database.bean.ContrailDataBean -import com.mogo.och.weaknet.database.bean.TaskDataBean -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean -import com.mogo.och.weaknet.database.repository.ContraiRepository -import com.mogo.och.weaknet.database.repository.EventRepository -import com.mogo.och.weaknet.database.repository.LineRepository -import com.mogo.och.weaknet.database.repository.TaskRepository -import com.mogo.och.weaknet.database.repository.TaskSiteRepository -import com.mogo.och.weaknet.database.transform.FRetryWithTime11 -import com.mogo.och.weaknet.database.transform.TransformTask -import com.mogo.och.weaknet.database.transform.transform4DataBase import com.mogo.och.weaknet.net.OrderServiceManager +import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.repository.ContraiRepository +import com.mogo.och.weaknet.repository.db.repository.LineRepository +import com.mogo.och.weaknet.repository.db.repository.TaskRepository +import com.mogo.och.weaknet.repository.db.repository.TaskSiteRepository +import com.mogo.och.weaknet.repository.db.transform.FRetryWithTime11 +import com.mogo.och.weaknet.repository.db.transform.TransformTask +import com.mogo.och.weaknet.repository.db.transform.transform4DataBase import io.reactivex.Observer import io.reactivex.disposables.Disposable import java.util.concurrent.ConcurrentHashMap @@ -258,7 +249,7 @@ object BusLineModel { line.name, object : TaskRepository.TaskStatusCallback { override fun startSuccess() { - EventRepository.saveEventTaskStart(task.id,line.lineId,task.taskStartTime,line.name) + com.mogo.och.weaknet.repository.db.repository.EventRepository.saveEventTaskStart(task.id,line.lineId,task.taskStartTime,line.name) OrderModel.queryBusRoutes() mBusLinesCallbackMap.forEach { it.value.onChangeLineIdSuccess() @@ -330,7 +321,7 @@ object BusLineModel { } val tempList = sorted.toMutableList() val possible = tempList.removeFirst() - val queryLastData = EventRepository.queryLastData() + val queryLastData = com.mogo.och.weaknet.repository.db.repository.EventRepository.queryLastData() if(queryLastData!=null){ if(possible.taskId==queryLastData.taskId){ // 最后一个事件和最新的task一直 恢复数据 @@ -434,7 +425,7 @@ object BusLineModel { OchChainLogManager.writeChainLogDb("滑动出发", "task:${currentTask}__taskId:${currentTask?.taskId}") // 设置滑动出发任务 LineManager.lineInfos?.lineName?.let { lineName-> - EventRepository.saveEventTaskLeaveSite( + com.mogo.och.weaknet.repository.db.repository.EventRepository.saveEventTaskLeaveSite( task.taskId!!, task.lineId!!, it.siteId.toLong(), @@ -471,7 +462,7 @@ object BusLineModel { TaskSiteRepository.updateDrivingStatusAndLeave(task.taskId!!,start.siteId.toLong(),TaskSiteDataBean.drivingStatusPassed,false) // 设置到站任务 LineManager.lineInfos?.let {lineInfo -> - EventRepository.saveEventTaskArriveSite(task.taskId!!,task.lineId!!,start.siteId.toLong(),start.seq,task.taskStartTime,lineInfo.lineName) + com.mogo.och.weaknet.repository.db.repository.EventRepository.saveEventTaskArriveSite(task.taskId!!,task.lineId!!,start.siteId.toLong(),start.seq,task.taskStartTime,lineInfo.lineName) } } } @@ -526,7 +517,7 @@ object BusLineModel { if (task.taskId!=null&&task.lineId!=null) { TaskRepository.endTask(task.taskId!!) LineManager.lineInfos?.lineName?.let {lineName-> - EventRepository.saveEventTaskEnd(task.taskId!!,task.lineId!!,task.taskStartTime,lineName) + com.mogo.och.weaknet.repository.db.repository.EventRepository.saveEventTaskEnd(task.taskId!!,task.lineId!!,task.taskStartTime,lineName) } } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt index d902d53bfc..79091b7d46 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt @@ -3,16 +3,15 @@ package com.mogo.och.weaknet.model import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.weaknet.bean.ShuttleEventRequest import com.mogo.och.weaknet.bean.WaitUploadLine import com.mogo.och.weaknet.bean.WaitUploadTask -import com.mogo.och.weaknet.database.bean.EventDataBean -import com.mogo.och.weaknet.database.repository.EventRepository import com.mogo.och.weaknet.net.OrderServiceManager +import com.mogo.och.weaknet.repository.db.bean.EventDataBean +import com.mogo.och.weaknet.repository.db.repository.EventRepository import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt similarity index 73% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/MyDataBase.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index f525b824dc..0842f7b2cf 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database +package com.mogo.och.weaknet.repository.db import android.os.Environment import androidx.room.Database @@ -8,18 +8,18 @@ import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.SupportSQLiteOpenHelper import com.mogo.commons.AbsMogoApplication -import com.mogo.och.weaknet.database.bean.ContrailDataBean -import com.mogo.och.weaknet.database.bean.EventDataBean -import com.mogo.och.weaknet.database.bean.LineDataBean -import com.mogo.och.weaknet.database.bean.SiteDataBean -import com.mogo.och.weaknet.database.bean.TaskDataBean -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean -import com.mogo.och.weaknet.database.dao.ContrailDataDao -import com.mogo.och.weaknet.database.dao.EventDataDao -import com.mogo.och.weaknet.database.dao.LineDataDao -import com.mogo.och.weaknet.database.dao.SiteDataDao -import com.mogo.och.weaknet.database.dao.TaskDataDao -import com.mogo.och.weaknet.database.dao.TaskSiteDataDao +import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.weaknet.repository.db.bean.EventDataBean +import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.dao.ContrailDataDao +import com.mogo.och.weaknet.repository.db.dao.EventDataDao +import com.mogo.och.weaknet.repository.db.dao.LineDataDao +import com.mogo.och.weaknet.repository.db.dao.SiteDataDao +import com.mogo.och.weaknet.repository.db.dao.TaskDataDao +import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao import java.io.File //注解Database告诉系统这是Room数据库对象 diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/ContrailDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt similarity index 98% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/ContrailDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt index 4ddfdf1eeb..970e564282 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/ContrailDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/EventDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt similarity index 98% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/EventDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt index 74f548ee28..9481b8222c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/EventDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/LineDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt similarity index 96% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/LineDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt index 6414cb34ee..40ad7b8502 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/LineDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/SiteDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt similarity index 97% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/SiteDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt index d63fdc2aa1..2cb9f5cff1 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/SiteDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/SiteDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt similarity index 97% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt index 118df452bb..8df958cd8d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskSiteDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt similarity index 98% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskSiteDataBean.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt index 2ff89f8421..0b8c408a47 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/bean/TaskSiteDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.bean +package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/ContrailDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt similarity index 91% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/ContrailDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt index 9b0da697e6..63a94fff6e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/ContrailDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/ContrailDataDao.kt @@ -1,10 +1,10 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.mogo.och.weaknet.database.bean.ContrailDataBean +import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean @Dao interface ContrailDataDao { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/EventDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt similarity index 93% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/EventDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt index dd49389774..d598068e2c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/EventDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Delete @@ -6,7 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.bean.EventDataBean +import com.mogo.och.weaknet.repository.db.bean.EventDataBean import io.reactivex.Observable @Dao diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/LineDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt similarity index 93% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/LineDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt index b23de5324d..d34d6a988a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/LineDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/LineDataDao.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Delete @@ -6,7 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.bean.LineDataBean +import com.mogo.och.weaknet.repository.db.bean.LineDataBean import io.reactivex.Observable @Dao diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/SiteDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt similarity index 92% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/SiteDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt index 32f9cc8fe4..4860806608 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/SiteDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt @@ -1,10 +1,10 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.mogo.och.weaknet.database.bean.SiteDataBean +import com.mogo.och.weaknet.repository.db.bean.SiteDataBean @Dao interface SiteDataDao { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskDataDao.kt similarity index 95% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskDataDao.kt index 6b5b7a3629..752574ad4b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskDataDao.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Delete @@ -6,8 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.bean.TaskDataBean -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import io.reactivex.Observable @Dao diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskSiteDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskSiteDataDao.kt similarity index 92% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskSiteDataDao.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskSiteDataDao.kt index cd81fe13b2..2823bbc741 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/dao/TaskSiteDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskSiteDataDao.kt @@ -1,11 +1,11 @@ -package com.mogo.och.weaknet.database.dao +package com.mogo.och.weaknet.repository.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean @Dao interface TaskSiteDataDao { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/exception/DataException.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DataException.kt similarity index 69% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/exception/DataException.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DataException.kt index 953b28b9af..a9a6e637c4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/exception/DataException.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/exception/DataException.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.exception +package com.mogo.och.weaknet.repository.db.exception class DataException: RuntimeException { constructor() : super() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/ContraiRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiRepository.kt similarity index 87% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/ContraiRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiRepository.kt index 0d76bb1510..eebe434368 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/ContraiRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/ContraiRepository.kt @@ -1,10 +1,9 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.network.utils.digest.DigestUtils -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.ContrailDataBean -import com.mogo.och.weaknet.database.dao.ContrailDataDao +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean +import com.mogo.och.weaknet.repository.db.dao.ContrailDataDao object ContraiRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/DbThreadUtils.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/DbThreadUtils.kt similarity index 83% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/DbThreadUtils.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/DbThreadUtils.kt index f84869af13..ca65daada8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/DbThreadUtils.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/DbThreadUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.utilcode.util.ThreadUtils diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/EventRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventRepository.kt similarity index 95% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/EventRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventRepository.kt index a1c26b39f6..502553854e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/EventRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventRepository.kt @@ -1,11 +1,11 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.EventDataBean -import com.mogo.och.weaknet.database.dao.EventDataDao +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.EventDataBean +import com.mogo.och.weaknet.repository.db.dao.EventDataDao import io.reactivex.Observable diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/LineRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineRepository.kt similarity index 93% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/LineRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineRepository.kt index e60cd8a156..7d6024c8fa 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/LineRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/LineRepository.kt @@ -1,9 +1,9 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.LineDataBean -import com.mogo.och.weaknet.database.dao.LineDataDao +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.weaknet.repository.db.dao.LineDataDao import io.reactivex.Observable object LineRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/SiteRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteRepository.kt similarity index 84% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/SiteRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteRepository.kt index 2e205feebb..7891d7a57b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/SiteRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteRepository.kt @@ -1,10 +1,9 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.network.utils.digest.DigestUtils -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.SiteDataBean -import com.mogo.och.weaknet.database.dao.SiteDataDao +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.weaknet.repository.db.dao.SiteDataDao object SiteRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskRepository.kt similarity index 95% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskRepository.kt index 89ad00b521..494d10e2cf 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskRepository.kt @@ -1,4 +1,4 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -6,10 +6,10 @@ import com.mogo.eagle.core.utilcode.util.TAG import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.TaskDataBean -import com.mogo.och.weaknet.database.dao.TaskDataDao -import com.mogo.och.weaknet.database.exception.DataException +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import com.mogo.och.weaknet.repository.db.dao.TaskDataDao +import com.mogo.och.weaknet.repository.db.exception.DataException import io.reactivex.Observable object TaskRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskSiteRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteRepository.kt similarity index 90% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskSiteRepository.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteRepository.kt index 1437e42c87..9c7085cc2a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskSiteRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteRepository.kt @@ -1,12 +1,12 @@ -package com.mogo.och.weaknet.database.repository +package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.TAG import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager -import com.mogo.och.weaknet.database.MyDataBase -import com.mogo.och.weaknet.database.bean.TaskSiteDataBean -import com.mogo.och.weaknet.database.dao.TaskSiteDataDao -import com.mogo.och.weaknet.database.exception.DataException +import com.mogo.och.weaknet.repository.db.MyDataBase +import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean +import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao +import com.mogo.och.weaknet.repository.db.exception.DataException object TaskSiteRepository { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/transform/DataBaseTransform.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/transform/DataBaseTransform.kt similarity index 71% rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/transform/DataBaseTransform.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/transform/DataBaseTransform.kt index 7bebd1c72b..24aec899ad 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/transform/DataBaseTransform.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/transform/DataBaseTransform.kt @@ -1,18 +1,9 @@ -package com.mogo.och.weaknet.database.transform +package com.mogo.och.weaknet.repository.db.transform -import com.mogo.cloud.passport.MoGoAiCloudClient -import com.mogo.eagle.core.data.BaseData -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.och.common.module.biz.login.LoginStatusEnum -import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.network.interceptor.FRetryWithTime -import com.mogo.och.common.module.network.interceptor.OchCommonRetryException -import com.mogo.och.common.module.network.interceptor.RetryWithTime import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse import com.mogo.och.weaknet.bean.BusQueryLinesResponse -import com.mogo.och.weaknet.database.bean.LineDataBean -import com.mogo.och.weaknet.database.bean.TaskDataBean +import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import io.reactivex.Observable import io.reactivex.ObservableSource import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt index 373f0a2b50..c4808b875c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt @@ -3,10 +3,8 @@ package com.mogo.och.weaknet.ui.bizswitch import androidx.lifecycle.ViewModel import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.data.bean.BusStationBean import com.mogo.och.weaknet.bean.BusQueryLinesResponse import com.mogo.och.weaknet.callback.IBusLinesCallback -import com.mogo.och.weaknet.database.bean.TaskDataBean import com.mogo.och.weaknet.model.BusLineModel /**