diff --git a/.idea/misc.xml b/.idea/misc.xml
index e73cf5868e..1b3cdd5e62 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -20,7 +20,8 @@
-
+
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index ea791a701e..e2303c182e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -5,6 +5,7 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo
@@ -17,10 +18,10 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager
import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.AppUtils
-import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.map.MogoMap
+import com.mogo.utils.DeviceIdUtils
import com.mogo.utils.network.utils.GsonUtil
import com.mogo.utils.storage.SharedPrefsMgr
import kotlinx.android.synthetic.main.view_debug_setting.view.*
@@ -68,7 +69,7 @@ class DebugSettingView @JvmOverloads constructor(
appConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
appConfigInfo.appVersionName = AppUtils.getAppVersionName()
appConfigInfo.appPackageName = AppUtils.getAppPackageName()
- appConfigInfo.uniqueDeviceId = DeviceUtils.getUniqueDeviceId()
+ appConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
appConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
appConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion
diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
index 0148140f80..23abc75d82 100644
--- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
@@ -98,18 +98,17 @@ public class SmallMapDirectionView
SmpServiceManager.getMogoRegisterCenter()
.registerCarLocationChangedListener(MODULE_NAME, this);
- setOnClickListener(view -> {
- if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
- MogoApisHandler.getInstance().getApis()
- .getMapServiceApi()
- .getMapUIController()
- .changeMapMode(
- MogoApisHandler.getInstance()
- .getApis()
- .getAdasControllerApi()
- .getCurrentSkinMode()
- );
- }
+ setOnLongClickListener(view -> {
+ MogoApisHandler.getInstance().getApis()
+ .getMapServiceApi()
+ .getMapUIController()
+ .changeMapMode(
+ MogoApisHandler.getInstance()
+ .getApis()
+ .getAdasControllerApi()
+ .getCurrentSkinMode()
+ );
+ return false;
});
}
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
index aa03c0c3de..6b158612c0 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
@@ -1,5 +1,10 @@
package com.mogo.eagle.core.utilcode.util;
+import static android.Manifest.permission.ACCESS_WIFI_STATE;
+import static android.Manifest.permission.CHANGE_WIFI_STATE;
+import static android.Manifest.permission.INTERNET;
+import static android.content.Context.WIFI_SERVICE;
+
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@@ -23,11 +28,6 @@ import java.net.SocketException;
import java.util.Enumeration;
import java.util.UUID;
-import static android.Manifest.permission.ACCESS_WIFI_STATE;
-import static android.Manifest.permission.CHANGE_WIFI_STATE;
-import static android.Manifest.permission.INTERNET;
-import static android.content.Context.WIFI_SERVICE;
-
/**
*
* author: Blankj
@@ -403,7 +403,7 @@ public final class DeviceUtils {
}
- private static final String KEY_UDID = "KEY_UDID";
+ private static final String KEY_UDID = "KEY_UDID";
private volatile static String udid;
/**
@@ -479,8 +479,9 @@ public final class DeviceUtils {
if (!TextUtils.isEmpty(androidId)) {
return saveUdid(prefix + 2, androidId);
}
-
- } catch (Exception ignore) {/**/}
+ } catch (Exception ignore) {
+ ignore.printStackTrace();
+ }
return saveUdid(prefix + 9, "");
}
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index 436f3c192d..6b2ce7484b 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -8,10 +8,8 @@ import android.telephony.TelephonyManager;
import android.telephony.cdma.CdmaCellLocation;
import android.telephony.gsm.GsmCellLocation;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
-import com.mogo.eagle.core.utilcode.util.DeviceUtils;
import com.mogo.utils.DeviceIdUtils;
import java.lang.reflect.InvocationTargetException;
@@ -23,36 +21,36 @@ import java.lang.reflect.Method;
public class Utils {
- public static String getCellId( Context context ) {
- TelephonyManager tm = ( TelephonyManager ) context.getSystemService( Context.TELEPHONY_SERVICE );
- if ( tm == null ) {
+ public static String getCellId(Context context) {
+ TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+ if (tm == null) {
return "";
}
PackageManager pm = context.getPackageManager();
- boolean accessCoarseLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
- pm.checkPermission( Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName() ) );
- boolean accessFineLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
- pm.checkPermission( Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName() ) );
- if ( !accessCoarseLocationPermission || !accessFineLocationPermission )
+ boolean accessCoarseLocationPermission = (PackageManager.PERMISSION_GRANTED ==
+ pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName()));
+ boolean accessFineLocationPermission = (PackageManager.PERMISSION_GRANTED ==
+ pm.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName()));
+ if (!accessCoarseLocationPermission || !accessFineLocationPermission)
return "noPermission";
CellLocation location = null;
try {
location = tm.getCellLocation();
- } catch ( Exception e ) {
+ } catch (Exception e) {
e.printStackTrace();
}
- if ( location != null ) {
+ if (location != null) {
// Gsm网络 , 联通移动的网络属于这一套
- if ( location instanceof GsmCellLocation ) {
- GsmCellLocation gsmLoc = ( GsmCellLocation ) location;
+ if (location instanceof GsmCellLocation) {
+ GsmCellLocation gsmLoc = (GsmCellLocation) location;
int cellid = gsmLoc.getCid();
- return String.valueOf( cellid );
+ return String.valueOf(cellid);
// Cdma网络 , 电信网络属于这一种
- } else if ( location instanceof CdmaCellLocation ) {
- CdmaCellLocation cdmaLoc = ( CdmaCellLocation ) location;
- return String.valueOf( cdmaLoc.getBaseStationId() );
+ } else if (location instanceof CdmaCellLocation) {
+ CdmaCellLocation cdmaLoc = (CdmaCellLocation) location;
+ return String.valueOf(cdmaLoc.getBaseStationId());
}
}
return "";
@@ -66,31 +64,25 @@ public class Utils {
public static final String PROPERTIES = "android.os.SystemProperties";
public static String getDevicesId() {
- if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
- return DeviceUtils.getUniqueDeviceId();
+ if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
+ return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
}
- return getSystemProperties( GSM_SERIAL );
+ return getSystemProperties(GSM_SERIAL);
}
public static String getFotaVersion() {
- return getSystemProperties( FOTA_VERSION );
+ return getSystemProperties(FOTA_VERSION);
}
- public static String getSystemProperties( String name ) {
+ public static String getSystemProperties(String name) {
String value = "";
try {
- Class< ? > c = Class.forName( PROPERTIES );
- Method get = c.getMethod( GET, String.class );
- value = ( String ) get.invoke( c, name );
- } catch ( ClassNotFoundException var3 ) {
+ Class c = Class.forName(PROPERTIES);
+ Method get = c.getMethod(GET, String.class);
+ value = (String) get.invoke(c, name);
+ } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException var3) {
var3.printStackTrace();
- } catch ( NoSuchMethodException var4 ) {
- var4.printStackTrace();
- } catch ( InvocationTargetException var5 ) {
- var5.printStackTrace();
- } catch ( IllegalAccessException var6 ) {
- var6.printStackTrace();
}
return value;
}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
index 3e561c9530..efc85b2653 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
@@ -36,33 +36,25 @@ public final class DeviceIdUtils {
if ( TextUtils.isEmpty( deviceId )) {
deviceId = getDeviceIdInternal(appContext);
- if (!TextUtils.isEmpty(deviceId)) {
- saveDeviceId(appContext,deviceId);
- } else {
- if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
- if ( ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE ) == PackageManager.PERMISSION_GRANTED ) {
- deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
+ if (TextUtils.isEmpty(deviceId)) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+ deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
}
- }else{
- deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
- }
- if (!TextUtils.isEmpty(deviceId)) {
- saveDeviceId(appContext,deviceId);
} else {
+ deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
+ }
+ if (TextUtils.isEmpty(deviceId)) {
deviceId = getDeviceSerial();
- if (!TextUtils.isEmpty(deviceId) && !deviceId.equalsIgnoreCase("unknown")) {
- saveDeviceId(appContext,deviceId);
- } else {
+ if (TextUtils.isEmpty(deviceId) || deviceId.equalsIgnoreCase("unknown")) {
deviceId = getAndroidId(appContext);
- if (!TextUtils.isEmpty(deviceId)) {
- saveDeviceId(appContext,deviceId);
- } else {
- deviceId = String.valueOf( System.currentTimeMillis());
- saveDeviceId(appContext,deviceId);
+ if (TextUtils.isEmpty(deviceId)) {
+ deviceId = String.valueOf(System.currentTimeMillis());
}
}
}
}
+ saveDeviceId(appContext,deviceId);
}
return deviceId;
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 1949915969..8525b36650 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -23,9 +23,9 @@ import android.widget.TextView;
import com.mogo.commons.FunctionBuildConfig;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoMapView;
-import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.impl.custom.location.GpsTester;
import com.mogo.map.impl.custom.navi.NaviClient;
import com.mogo.map.impl.custom.utils.MogoMapUtils;
@@ -351,28 +351,28 @@ public class AMapViewWrapper implements IMogoMapView,
Logger.d(TAG, "设置的样式 = %s", ui);
if (checkAMapView()) {
switch (ui) {
- // case CarUp_2D:
- // case CarUp_3D:
- // case NorthUP_2D:
- // setUIMode(ui);
- // break;
+ case CarUp_2D:
+ case CarUp_3D:
+ case NorthUP_2D:
+ setUIMode(ui);
+ break;
case Type_VR:
mMapView.getMapAutoViewHelper().setScaleVRMode(true);
mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
return;
- // case Type_Light:
- // mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
- // mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
- // mIsLightStyle = true;
- // break;
- // case Type_Night:
- // mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
- // mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
- // mIsLightStyle = false;
- // break;
- // case Type_AUTO_LIGHT_Night:
- // mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
- // break;
+ case Type_Light:
+ mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
+ mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
+ mIsLightStyle = true;
+ break;
+ case Type_Night:
+ mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
+ mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
+ mIsLightStyle = false;
+ break;
+ case Type_AUTO_LIGHT_Night:
+ mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
+ break;
}
}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 825cd22442..c4bf28bcfc 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -126,7 +126,6 @@ public class EntranceFragment extends MvpFragment
-
-
-
-
-
-