yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qa' into qa

Browse Source
This commit is contained in:
tongchenfei
2020-06-24 14:07:14 +08:00
parent d247c99c7f 0ce18a46f8
commit 20de31120a
289 changed files with 4809 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
View File

@@ -89,7 +89,7 @@ public enum AppEnum {
BT_PHONE( "蓝牙电话", "com.nwd.android.phone", R.drawable.module_apps_ic_bt_phone ),
// 本地音乐
LOCAL_MUSIC( "本地音乐", "", R.drawable.module_apps_ic_local_music ),
LOCAL_MUSIC( "本地音乐", "com.nwd.android.music.ui", R.drawable.module_apps_ic_local_music ),
// 天气
WEATHER( "天气", "com.zhidao.weather", R.drawable.module_apps_ic_weather ),

18
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
View File

@@ -5,6 +5,7 @@ import android.text.TextUtils;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
@SuppressWarnings("unused")
public class MarkerExploreWay implements Serializable {
@@ -137,7 +138,7 @@ public class MarkerExploreWay implements Serializable {
}
public String getPoiType() {
if ( TextUtils.isEmpty( poiType ) ) {
if (TextUtils.isEmpty(poiType)) {
return MarkerPoiTypeEnum.FOURS_BLOCK_UP;
}
return poiType;
@@ -155,6 +156,21 @@ public class MarkerExploreWay implements Serializable {
this.uploadType = uploadType;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MarkerExploreWay that = (MarkerExploreWay) o;
return Objects.equals(infoId, that.infoId) &&
Objects.equals(type, that.type) &&
Objects.equals(poiType, that.poiType);
}
@Override
public int hashCode() {
return Objects.hash(infoId, type, poiType);
}
@Override
public String toString() {
return "MarkerExploreWay{" +

6
modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
View File

@@ -19,6 +19,8 @@ public class CarSeries {
public static final int CAR_SERIES_G80X = 40;
public static final int CAR_SERIES_E84X = 50;
public static final int CAR_SERIES_E84XCD = 51;
public static final int CAR_SERIES_E85X = 50;
public static final int CAR_SERIES_E85XCD = 51;
public static int CAR_SERIES = 0;
@@ -52,6 +54,10 @@ public class CarSeries {
CAR_SERIES = CAR_SERIES_E84X;
} else if ( "E84XCD".equals( device ) ) {
CAR_SERIES = CAR_SERIES_E84XCD;
} else if ( "E851-852".equals( device ) ) {
CAR_SERIES = CAR_SERIES_E85X;
} else if ( "E85XCD".equals( device ) ) {
CAR_SERIES = CAR_SERIES_E85XCD;
} else {
CAR_SERIES = CAR_SERIES_F80X;
}