Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

This commit is contained in:
yangyakun
2023-02-07 16:57:41 +08:00
131 changed files with 2322 additions and 3248 deletions

View File

@@ -525,6 +525,7 @@ public final class DeviceUtils {
/**
* 判断用户是否打开系统定位服务
*
* @return true 已经打开定位服务false 没有打开定位服务
*/
public static boolean isLocationEnabled() {
@@ -544,4 +545,19 @@ public final class DeviceUtils {
}
}
/**
* 中科创达 EB5获取SN好的方法
* getprop persist.device.sn
* ZTS46S10009S
*
* @return 当前EB5设备SN
*/
public static String getEB5DevicesSN() {
ShellUtils.CommandResult result = UtilsBridge.execCmd("getprop persist.device.sn", false);
if (result.result == 0) {
LogUtils.d("", result.toString());
}
return "02:00:00:00:00:00";
}
}