opt

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java

@@ -2,7 +2,9 @@ package com.mogo.module.common.entity;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.MogoLatLng;
 import com.mogo.utils.CoordinateUtils;
 
@@ -21,8 +23,14 @@ public class CloudLocationInfo implements Parcelable {
     private long satelliteTime;
     private double alt;
     private double speed;
+    private int vehicleType = 0;
 
     public CloudLocationInfo() {
+        if ( DebugConfig.getProductFlavor().contains( "taxi" ) ) {
+            vehicleType = 9;
+        } else if ( DebugConfig.getProductFlavor().contains( "bus" ) ) {
+            vehicleType = 10;
+        }
     }
 
     public CloudLocationInfo( CloudLocationInfo info ) {
@@ -35,7 +43,7 @@ public class CloudLocationInfo implements Parcelable {
         this.speed = info.speed;
     }
 
-    public void convertCoor2GCJ02(){
+    public void convertCoor2GCJ02() {
         double[] amapCoord = CoordinateUtils.transformFromWGSToGCJ( lat, lon );
         if ( amapCoord != null ) {
             this.lat = amapCoord[0];
@@ -43,44 +51,6 @@ public class CloudLocationInfo implements Parcelable {
         }
     }
 
-    protected CloudLocationInfo( Parcel in ) {
-        lat = in.readDouble();
-        lon = in.readDouble();
-        heading = in.readDouble();
-        systemTime = in.readLong();
-        satelliteTime = in.readLong();
-        alt = in.readDouble();
-        speed = in.readDouble();
-    }
-
-    @Override
-    public void writeToParcel( Parcel dest, int flags ) {
-        dest.writeDouble( lat );
-        dest.writeDouble( lon );
-        dest.writeDouble( heading );
-        dest.writeLong( systemTime );
-        dest.writeLong( satelliteTime );
-        dest.writeDouble( alt );
-        dest.writeDouble( speed );
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    public static final Creator< CloudLocationInfo > CREATOR = new Creator< CloudLocationInfo >() {
-        @Override
-        public CloudLocationInfo createFromParcel( Parcel in ) {
-            return new CloudLocationInfo( in );
-        }
-
-        @Override
-        public CloudLocationInfo[] newArray( int size ) {
-            return new CloudLocationInfo[size];
-        }
-    };
-
     public double getLat() {
         return lat;
     }
@@ -172,4 +142,44 @@ public class CloudLocationInfo implements Parcelable {
     public int hashCode() {
         return Objects.hash( lat, lon );
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel( Parcel dest, int flags ) {
+        dest.writeDouble( this.lat );
+        dest.writeDouble( this.lon );
+        dest.writeDouble( this.heading );
+        dest.writeLong( this.systemTime );
+        dest.writeLong( this.satelliteTime );
+        dest.writeDouble( this.alt );
+        dest.writeDouble( this.speed );
+        dest.writeInt( this.vehicleType );
+    }
+
+    protected CloudLocationInfo( Parcel in ) {
+        this.lat = in.readDouble();
+        this.lon = in.readDouble();
+        this.heading = in.readDouble();
+        this.systemTime = in.readLong();
+        this.satelliteTime = in.readLong();
+        this.alt = in.readDouble();
+        this.speed = in.readDouble();
+        this.vehicleType = in.readInt();
+    }
+
+    public static final Creator< CloudLocationInfo > CREATOR = new Creator< CloudLocationInfo >() {
+        @Override
+        public CloudLocationInfo createFromParcel( Parcel source ) {
+            return new CloudLocationInfo( source );
+        }
+
+        @Override
+        public CloudLocationInfo[] newArray( int size ) {
+            return new CloudLocationInfo[size];
+        }
+    };
 }