Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6

# Conflicts:
#	OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java

OCH/common/data/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.och.data">
+
+</manifest>

OCH/common/data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java

@@ -0,0 +1,114 @@
+package com.mogo.och.data.bean;
+
+import java.util.List;
+
+/**
+ * 网约车小巴路线接口返回接口数据封装
+ *
+ * @author tongchenfei
+ */
+public class BusRoutesResult {
+    private List<BusStationBean> sites;
+    private int lineId;
+    private String name;
+    private int lineType;  //线路类型，0:环形
+    private String description;
+    private int status;
+    private long taskTime; //线路时间班次
+    private int taskId;// 线路班次id
+    private String runningDur; //运营时间
+    private long writeVersion; //更新时间戳
+
+    //线路轨迹相关字段
+    public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“”
+    public String csvFileMd5 = ""; //轨迹文件md5，默认“”
+    public String txtFileUrl = ""; //打点文件下载的cos url，默认“”
+    public String txtFileMd5 = ""; //轨迹文件md5，默认“”
+    public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+    public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
+    public String csvFileUrlDPQP = ""; //轨迹文件下载的cos url，默认“”
+    public String csvFileMd5DPQP = ""; //轨迹文件md5，默认“”
+    public String txtFileUrlDPQP = ""; //打点文件下载的cos url，默认“”
+    public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“”
+    public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+
+    public String getRunningDur() {
+        return runningDur;
+    }
+
+    public void setRunningDur(String runningDur) {
+        this.runningDur = runningDur;
+    }
+
+    public int getLineId() {
+        return lineId;
+    }
+
+    public int getTaskId() {
+        return taskId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<BusStationBean> getSites() {
+        return sites;
+    }
+
+    public void setSite(List<BusStationBean> site) {
+        this.sites = site;
+    }
+
+    public long getTaskTime() {
+        return taskTime;
+    }
+
+    public long getWriteVersion() {
+        return writeVersion;
+    }
+
+    public void setWriteVersion(long writeVersion) {
+        this.writeVersion = writeVersion;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BusRoutesResult that = (BusRoutesResult) o;
+        return lineId == that.lineId
+                && lineType == that.lineType
+                && status == that.status
+                && sites.equals(that.sites)
+                && name.equals(that.name)
+                && writeVersion == that.writeVersion
+                && runningDur.equals(that.runningDur);
+    }
+
+    @Override
+    public String toString() {
+        return "BusRoutesResult{" +
+                "sites=" + sites +
+                ", lineId=" + lineId +
+                ", name='" + name + '\'' +
+                ", lineType=" + lineType +
+                ", description='" + description + '\'' +
+                ", status=" + status +
+                ", taskTime=" + taskTime +
+                ", taskId=" + taskId +
+                ", writeVersion=" + writeVersion +
+                ", csvFileUrl='" + csvFileUrl + '\'' +
+                ", csvFileMd5='" + csvFileMd5 + '\'' +
+                ", txtFileUrl='" + txtFileUrl + '\'' +
+                ", txtFileMd5='" + txtFileMd5 + '\'' +
+                ", contrailSaveTime=" + contrailSaveTime +
+                ", carModel='" + carModel + '\'' +
+                ", csvFileUrlDPQP='" + csvFileUrlDPQP + '\'' +
+                ", csvFileMd5DPQP='" + csvFileMd5DPQP + '\'' +
+                ", txtFileUrlDPQP='" + txtFileUrlDPQP + '\'' +
+                ", txtFileMd5DPQP='" + txtFileMd5DPQP + '\'' +
+                ", contrailSaveTimeDPQP=" + contrailSaveTimeDPQP +
+                '}';
+    }
+}

OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java

@@ -0,0 +1,136 @@
+package com.mogo.och.data.bean;
+
+import java.util.Objects;
+
+/**
+ * 单个网约车小巴车站信息
+ *
+ * @author tongchenfei
+ */
+public class BusStationBean {
+    private int siteId;
+    private String name;
+    private String nameKr;
+    private int seq;
+    private double gcjLon; //高德
+    private double gcjLat; //高德
+    private double lon; //高精坐标
+    private double lat; //高精坐标
+    private int drivingStatus;//行驶信息，0初始值；1已经过；2当前站；3未到站
+    private boolean leaving;
+
+    public String getNameKr() {
+        return nameKr;
+    }
+
+    public int getSiteId() {
+        return siteId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSeq() {
+        return seq;
+    }
+
+    public double getGcjLon() {
+        return gcjLon;
+    }
+
+    public double getGcjLat() {
+        return gcjLat;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public int getDrivingStatus() {
+        return drivingStatus;
+    }
+
+    public boolean isLeaving() {
+        return leaving;
+    }
+
+    public void setSiteId(int siteId) {
+        this.siteId = siteId;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    public void setGcjLon(double gcjLon) {
+        this.gcjLon = gcjLon;
+    }
+
+    public void setGcjLat(double gcjLat) {
+        this.gcjLat = gcjLat;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public void setDrivingStatus(int drivingStatus) {
+        this.drivingStatus = drivingStatus;
+    }
+
+    public void setLeaving(boolean leaving) {
+        this.leaving = leaving;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BusStationBean that = (BusStationBean) o;
+        return siteId == that.siteId
+                && seq == that.seq
+                && Double.compare(that.gcjLon, gcjLon) == 0
+                && Double.compare(that.gcjLat, gcjLat) == 0
+                && Double.compare(that.lon, lon) == 0
+                && Double.compare(that.lat, lat) == 0
+                && drivingStatus == that.drivingStatus
+                && leaving == that.leaving
+                && name.equals(that.name)
+                && (nameKr == null || nameKr.equals(that.nameKr));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(siteId, name, nameKr, seq, gcjLon, gcjLat, lon, lat, drivingStatus, leaving);
+    }
+
+    @Override
+    public String toString() {
+        return "BusStationBean{" +
+                "siteId=" + siteId +
+                ", name='" + name + '\'' +
+                ", seq=" + seq +
+                ", gcjLon=" + gcjLon +
+                ", gcjLat=" + gcjLat +
+                ", lon=" + lon +
+                ", lat=" + lat +
+                ", drivingStatus=" + drivingStatus +
+                ", leaving=" + leaving +
+                '}';
+    }
+
+
+}

OCH/common/data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt

@@ -0,0 +1,9 @@
+package com.mogo.och.data.bean
+/**
+ * @author: wangmingjun
+ * @date: 2023/3/31
+ */
+data class BusTransferData (
+    var loginStatus: Int,
+    var routesResult: BusRoutesResult?,
+)

OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt

@@ -0,0 +1,28 @@
+package com.mogo.och.data.manager.cache
+
+import android.content.Context
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/3/27
+ */
+class CacheDataManager private constructor(){
+    companion object{
+        val instance: CacheDataManager by lazy (mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            CacheDataManager()
+        }
+    }
+
+    fun putCacheData(context: Context, key:String, jsonStr: String){
+        SharedPrefsMgr.getInstance(context).putString(key,jsonStr)
+    }
+
+    fun getCacheData(context: Context, key: String) : String{
+        return SharedPrefsMgr.getInstance(context).getString(key)
+    }
+
+    fun clearCacheData(context: Context, key: String){
+        SharedPrefsMgr.getInstance(context).remove(key)
+    }
+}