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

[sonar] merge

Browse Source
This commit is contained in:
zhongchao
2023-10-18 16:28:03 +08:00
parent da2fd464e5
commit 523ae08c5a
27 changed files with 277 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -8,3 +8,4 @@
/captures
.externalNativeBuild
.cxx
.gitlab-ci.yml

4
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java
View File

@@ -24,13 +24,13 @@ public class OCHStockBlurView extends View {
private float mDownsampleFactor; // default 4
private int mOverlayColor; // default #aaffffff
private float mBlurRadius; // default 10dp (0 < r <= 25)
private boolean onece;
private final boolean onece;
private boolean mDirty;
private Bitmap mBitmapToBlur, mBlurredBitmap;
private Canvas mBlurringCanvas;
private boolean mIsRendering;
private Paint mPaint;
private final Paint mPaint;
private final Rect mRectSrc = new Rect(), mRectDst = new Rect();
// mDecorView should be the root view of the activity (even if you are on a different window like a dialog)
private View mDecorView;

0
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCache.java Normal file
View File

0
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCacheManager.java Normal file
View File

1
core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml
View File

@@ -8,4 +8,5 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
</manifest>

23
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java
View File

@@ -5,7 +5,6 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEV
import android.media.AudioRecord;
import android.media.MediaRecorder;
import android.os.Environment;
import android.util.Log;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.FileUtils;
@@ -42,7 +41,7 @@ public class RecordHelper {
private File resultFile = null;
private File tmpFile = null;
private List<File> files = new ArrayList<>();
private final List<File> files = new ArrayList<>();
private Mp3EncodeThread mp3EncodeThread;
public RecordHelper(RecordConfig config) {
@@ -69,7 +68,9 @@ public class RecordHelper {
return;
}
String path = getFilePath(fileName);
if(path!=null){
resultFile = new File(path);
}
String tempFilePath = getTempFilePath();
tmpFile = new File(tempFilePath);
audioRecordThread = new AudioRecordThread();
@@ -134,7 +135,7 @@ public class RecordHelper {
}
}
private FftFactory fftFactory = new FftFactory(FftFactory.Level.Original);
private final FftFactory fftFactory = new FftFactory(FftFactory.Level.Original);
private void notifyData(final byte[] data) {
if (listener != null) {
@@ -192,14 +193,10 @@ public class RecordHelper {
@Override
public void run() {
super.run();
switch (currentConfig.getFormat()) {
case MP3:
if (currentConfig.getFormat() == RecordConfig.RecordFormat.MP3) {
startMp3Recorder();
break;
default:
} else {
startPcmRecorder();
break;
}
}
@@ -275,12 +272,9 @@ public class RecordHelper {
private void stopMp3Encoded() {
if (mp3EncodeThread != null) {
mp3EncodeThread.stopSafe(new Mp3EncodeThread.EncordFinishListener() {
@Override
public void onFinish() {
mp3EncodeThread.stopSafe(() -> {
notifyFinish();
mp3EncodeThread = null;
}
});
} else {
CallerLogger.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ ");
@@ -382,8 +376,7 @@ public class RecordHelper {
}
String format = currentConfig.getFormat().getExtension();
String filePath = String.format(Locale.getDefault(), "%s%s%s", ROOT_PATH, fileName, format);
return filePath;
return String.format(Locale.getDefault(), "%s%s%s", ROOT_PATH, fileName, format);
}
private String getTempFilePath() {

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -1311,11 +1311,9 @@ internal class DebugSettingView @JvmOverloads constructor(
*/
tbSelfLog.setOnCheckedChangeListener { _, isChecked ->
if (isChecked) {
LogUtils.getConfig().isLogSwitch = false
Logger.init(LogLevel.OFF)
MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false
} else {
LogUtils.getConfig().isLogSwitch = true
Logger.init(LogLevel.DEBUG)
MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = true
}

29
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCache.java
View File

@@ -143,13 +143,13 @@ final class DiskLruCache implements Closeable {
private final File journalFileBackup;
private final int appVersion;
private long maxSize;
private int maxFileCount;
private final int maxFileCount;
private final int valueCount;
private long size = 0;
private int fileCount = 0;
private Writer journalWriter;
private final LinkedHashMap<String, Entry> lruEntries =
new LinkedHashMap<String, Entry>(0, 0.75f, true);
new LinkedHashMap<>(0, 0.75f, true);
private int redundantOpCount;
/**
@@ -161,7 +161,7 @@ final class DiskLruCache implements Closeable {
/** This cache uses a single background thread to evict entries. */
final ThreadPoolExecutor executorService =
new ThreadPoolExecutor(0, 1, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
new ThreadPoolExecutor(0, 1, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
private final Callable<Void> cleanupCallable = new Callable<Void>() {
public Void call() throws Exception {
synchronized (DiskLruCache.this) {
@@ -355,9 +355,8 @@ final class DiskLruCache implements Closeable {
journalWriter.close();
}
Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(journalFileTmp), Util.US_ASCII));
try {
try (Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(journalFileTmp), Util.US_ASCII))) {
writer.write(MAGIC);
writer.write("\n");
writer.write(VERSION_1);
@@ -375,8 +374,6 @@ final class DiskLruCache implements Closeable {
writer.write(CLEAN + ' ' + entry.key + entry.getLengths() + '\n');
}
}
} finally {
writer.close();
}
if (journalFile.exists()) {
@@ -446,7 +443,7 @@ final class DiskLruCache implements Closeable {
}
redundantOpCount++;
journalWriter.append(READ + ' ' + key + '\n');
journalWriter.append(READ + ' ').append(key).append(String.valueOf('\n'));
if (journalRebuildRequired()) {
executorService.submit(cleanupCallable);
}
@@ -622,7 +619,7 @@ final class DiskLruCache implements Closeable {
}
redundantOpCount++;
journalWriter.append(REMOVE + ' ' + key + '\n');
journalWriter.append(REMOVE + ' ').append(key).append(String.valueOf('\n'));
lruEntries.remove(key);
if (journalRebuildRequired()) {
@@ -656,7 +653,7 @@ final class DiskLruCache implements Closeable {
if (journalWriter == null) {
return; // Already closed.
}
for (Entry entry : new ArrayList<Entry>(lruEntries.values())) {
for (Entry entry : new ArrayList<>(lruEntries.values())) {
if (entry.currentEditor != null) {
entry.currentEditor.abort();
}
@@ -706,7 +703,7 @@ final class DiskLruCache implements Closeable {
public final class Snapshot implements Closeable {
private final String key;
private final long sequenceNumber;
private File[] files;
private final File[] files;
private final InputStream[] ins;
private final long[] lengths;
@@ -756,7 +753,7 @@ final class DiskLruCache implements Closeable {
private static final OutputStream NULL_OUTPUT_STREAM = new OutputStream() {
@Override
public void write(int b) throws IOException {
public void write(int b) {
// Eat all writes silently. Nom nom.
}
};
@@ -777,7 +774,7 @@ final class DiskLruCache implements Closeable {
* Returns an unbuffered input stream to read the last committed value,
* or null if no value has been committed.
*/
public InputStream newInputStream(int index) throws IOException {
public InputStream newInputStream(int index) {
synchronized (DiskLruCache.this) {
if (entry.currentEditor != this) {
throw new IllegalStateException();
@@ -809,7 +806,7 @@ final class DiskLruCache implements Closeable {
* {@link #commit} is called. The returned output stream does not throw
* IOExceptions.
*/
public OutputStream newOutputStream(int index) throws IOException {
public OutputStream newOutputStream(int index) {
synchronized (DiskLruCache.this) {
if (entry.currentEditor != this) {
throw new IllegalStateException();
@@ -936,7 +933,7 @@ final class DiskLruCache implements Closeable {
this.lengths = new long[valueCount];
}
public String getLengths() throws IOException {
public String getLengths() {
StringBuilder result = new StringBuilder();
for (long size : lengths) {
result.append(' ').append(size);

3
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/DiskLruCacheManager.java
View File

@@ -25,10 +25,9 @@ public class DiskLruCacheManager {
private static volatile DiskLruCacheManager instance;
private static final byte[] obj = new byte[0];
private final int MAX_CACHE_SIZE = 64 * 1024 * 1024;
private DiskLruCacheManager(Context context) {
try {
int MAX_CACHE_SIZE = 64 * 1024 * 1024;
diskLruCache = DiskLruCache.open(context.getCacheDir(), 1, 1,
MAX_CACHE_SIZE, Integer.MAX_VALUE);
} catch (Exception e) {

4
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/LoggerPrinter.java
View File

@@ -107,6 +107,8 @@ final class LoggerPrinter implements Printer {
}
}
private static final String xmlHtml = "http://xml.apache.org/xslt";
public void xml( String tag, String xml) {
if ( TextUtils.isEmpty(xml)) {
this.d(tag, "Empty/Null xml content");
@@ -116,7 +118,7 @@ final class LoggerPrinter implements Printer {
StreamResult xmlOutput = new StreamResult(new StringWriter());
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty("indent", "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
transformer.setOutputProperty("{" + xmlHtml + "}indent-amount", "2");
transformer.transform(e, xmlOutput);
this.d(tag, xmlOutput.getWriter().toString().replaceFirst(">", ">\n"));
} catch ( TransformerException var5) {

38
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AssetsUtils.java
View File

@@ -1,38 +0,0 @@
package com.mogo.eagle.core.utilcode.util;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import java.io.BufferedInputStream;
import java.io.InputStream;
/**
* @author congtaowang
* @since 2019-12-12
* <p>
* 读取asset文件
*/
public class AssetsUtils {
private static final String TAG = "amap.AssetsUtils";
public static byte[] read( Context context, String fileName ) {
if ( context == null || TextUtils.isEmpty( fileName ) ) {
return null;
}
byte[] buffer = null;
try {
InputStream is = context.getAssets().open( fileName );
BufferedInputStream bis = new BufferedInputStream( is );
buffer = new byte[is.available()];
bis.read( buffer );
bis.close();
is.close();
Log.d( TAG, "read assets success: " + fileName + " size=" + buffer.length );
} catch ( Exception e ) {
e.printStackTrace();
}
return buffer;
}
}

29
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BitmapHelper.java
View File

@@ -53,9 +53,6 @@ public class BitmapHelper {
/**
* 根据原图添加圆角
*
* @param source
* @return
*/
public static Bitmap createRoundCornerImage( Bitmap source, float corner ) {
final Paint paint = new Paint();
@@ -75,7 +72,7 @@ public class BitmapHelper {
}
ByteArrayOutputStream bos = null;
byte[] result = null;
byte[] result;
try {
bos = new ByteArrayOutputStream();
@@ -150,7 +147,7 @@ public class BitmapHelper {
}
listener.onBeforeCompress();
ByteArrayOutputStream bos = null;
Bitmap target = null;
Bitmap target;
try {
bos = new ByteArrayOutputStream();
@@ -164,15 +161,11 @@ public class BitmapHelper {
byte[] result = bos.toByteArray();
target = bytesToBitmap( result );
if ( listener != null ) {
listener.onCompressSuccess( result );
}
} catch ( Exception e ) {
e.printStackTrace();
target = null;
if ( listener != null ) {
listener.onCompressFailed( "压缩失败" );
}
} finally {
IOUtils.closeSilently( bos );
}
@@ -203,7 +196,6 @@ public class BitmapHelper {
target = bytesToBitmap( result );
} catch ( Exception e ) {
e.printStackTrace();
target = null;
} finally {
IOUtils.closeSilently( bos );
}
@@ -630,26 +622,19 @@ public class BitmapHelper {
*/
public static Bitmap getVideoThumbnail( String filePath ) {
Bitmap b = null;
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
MediaMetadataRetriever retriever = null;
try {
retriever = new MediaMetadataRetriever();
if (Build.VERSION.SDK_INT >= 14)
retriever.setDataSource(filePath, new HashMap<String, String>());
else
retriever.setDataSource(filePath);
// mediaMetadataRetriever.setDataSource(videoPath);
retriever.setDataSource(filePath, new HashMap<>());
b = retriever.getFrameAtTime();
} catch ( IllegalArgumentException e ) {
e.printStackTrace();
} catch ( RuntimeException e ) {
e.printStackTrace();
} finally {
try {
if(retriever != null){
retriever.release();
} catch ( RuntimeException e ) {
e.printStackTrace();
} catch (IOException e) {
}
} catch ( RuntimeException | IOException e ) {
e.printStackTrace();
}
}

14
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceIdUtils.java
View File

@@ -39,13 +39,9 @@ public final class DeviceIdUtils {
if (TextUtils.isEmpty(deviceId)) {
deviceId = getDeviceIdInternal(appContext);
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)) {
deviceId = getDeviceSerial();
if (TextUtils.isEmpty(deviceId) || deviceId.equalsIgnoreCase("unknown")) {
@@ -65,11 +61,9 @@ public final class DeviceIdUtils {
private static String getDeviceIdInternal(Context context) {
String id = "";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
return id;
}
}
TelephonyManager telephonymanager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonymanager != null) {
@@ -100,13 +94,7 @@ public final class DeviceIdUtils {
method.setAccessible(true);
}
serial = (String) method.invoke(new Build(), "ro.serialno");
} catch (ClassNotFoundException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
e.printStackTrace();
}
return serial;

5
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/EncryptUtils.java
View File

@@ -175,7 +175,7 @@ public final class EncryptUtils {
public static byte[] encryptMD5File(final File file) {
if (file == null) return null;
FileInputStream fis = null;
DigestInputStream digestInputStream;
DigestInputStream digestInputStream = null;
try {
fis = new FileInputStream(file);
MessageDigest md = MessageDigest.getInstance("MD5");
@@ -191,6 +191,9 @@ public final class EncryptUtils {
return null;
} finally {
try {
if (digestInputStream != null) {
digestInputStream.close();
}
if (fis != null) {
fis.close();
}

27
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileUtils.java
View File

@@ -1091,7 +1091,7 @@ public final class FileUtils {
is = new BufferedInputStream(new FileInputStream(file));
byte[] buffer = new byte[1024];
int readChars;
if (LINE_SEP.endsWith("\n")) {
if (LINE_SEP != null && LINE_SEP.endsWith("\n")) {
while ((readChars = is.read(buffer, 0, 1024)) != -1) {
for (int i = 0; i < readChars; ++i) {
if (buffer[i] == '\n') ++count;
@@ -1442,13 +1442,8 @@ public final class FileUtils {
StatFs statFs = new StatFs(anyPathInFs);
long blockSize;
long totalSize;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
blockSize = statFs.getBlockSizeLong();
totalSize = statFs.getBlockCountLong();
} else {
blockSize = statFs.getBlockSize();
totalSize = statFs.getBlockCount();
}
return blockSize * totalSize;
}
@@ -1463,13 +1458,8 @@ public final class FileUtils {
StatFs statFs = new StatFs(anyPathInFs);
long blockSize;
long availableSize;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
blockSize = statFs.getBlockSizeLong();
availableSize = statFs.getAvailableBlocksLong();
} else {
blockSize = statFs.getBlockSize();
availableSize = statFs.getAvailableBlocks();
}
return blockSize * availableSize;
}
@@ -1558,8 +1548,6 @@ public final class FileUtils {
byte[] bytes = new byte[in.available()];
int length = in.read(bytes);
base64 = Base64.encodeToString(bytes, 0, length, Base64.DEFAULT);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
@@ -1709,9 +1697,7 @@ public final class FileUtils {
* @param listener
*/
public static void copy(final InputStream is, final String to, final FileCopyListener listener) {
new Thread(new Runnable() {
@Override
public void run() {
new Thread(() -> {
Log.w("FileUtils", "======copy======");
if (listener != null) {
@@ -1727,7 +1713,7 @@ public final class FileUtils {
int rc = 0;
File toFile = new File(to);
if (!toFile.getParentFile().exists()) {
if (toFile.getParentFile() != null && !toFile.getParentFile().exists()) {
toFile.getParentFile().mkdirs();
}
@@ -1744,7 +1730,6 @@ public final class FileUtils {
fos.flush();
fos.close();
is.close();
} catch (Exception e) {
if (listener != null) {
listener.onFail(e);
@@ -1755,7 +1740,6 @@ public final class FileUtils {
if (listener != null) {
listener.onFinish(to);
}
}
}).start();
}
@@ -1767,9 +1751,7 @@ public final class FileUtils {
* @param listener
*/
public static void copy(final String from, final String to, final FileCopyListener listener) {
new Thread(new Runnable() {
@Override
public void run() {
new Thread(() -> {
File file = null;
try {
file = new File(from);
@@ -1834,7 +1816,6 @@ public final class FileUtils {
if (listener != null) {
listener.onFinish(to);
}
}
}).start();
}

1231
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LogUtils.java
View File

File diff suppressed because it is too large Load Diff

9
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java
View File

@@ -58,7 +58,7 @@ public final class ProcessUtils {
public static String getForegroundProcessName() {
ActivityManager am =
(ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
//noinspection ConstantConditions
//noinspection Constant Conditions
List<ActivityManager.RunningAppProcessInfo> pInfo = am.getRunningAppProcesses();
if (pInfo != null && pInfo.size() > 0) {
for (ActivityManager.RunningAppProcessInfo aInfo : pInfo) {
@@ -68,7 +68,6 @@ public final class ProcessUtils {
}
}
}
if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP) {
PackageManager pm = Utils.getApp().getPackageManager();
Intent intent = new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS);
List<ResolveInfo> list =
@@ -119,7 +118,6 @@ public final class ProcessUtils {
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
}
return "";
}
@@ -223,9 +221,8 @@ public final class ProcessUtils {
}
private static String getCurrentProcessNameByFile() {
try {
File file = new File("/proc/" + Process.myPid() + "/" + "cmdline");
BufferedReader mBufferedReader = new BufferedReader(new FileReader(file));
try(BufferedReader mBufferedReader = new BufferedReader(new FileReader(file))) {
String processName = mBufferedReader.readLine().trim();
mBufferedReader.close();
return processName;
@@ -301,7 +298,7 @@ public final class ProcessUtils {
}
public static String getPackageName() {
String packageName = null;
String packageName;
BufferedReader reader = null;
try {

7
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/RomUtils.java
View File

@@ -393,7 +393,6 @@ public final class RomUtils {
}
private static String getSystemPropertyByShell(final String propName) {
String line;
BufferedReader input = null;
try {
Process p = Runtime.getRuntime().exec("getprop " + propName);
@@ -414,11 +413,9 @@ public final class RomUtils {
}
private static String getSystemPropertyByStream(final String key) {
try {
try( FileInputStream is = new FileInputStream(
new File(Environment.getRootDirectory(), "build.prop"))) {
Properties prop = new Properties();
FileInputStream is = new FileInputStream(
new File(Environment.getRootDirectory(), "build.prop")
);
prop.load(is);
return prop.getProperty(key, "");
} catch (Exception ignore) {/**/}

5
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SystemPropertiesUtils.java
View File

@@ -11,16 +11,15 @@ public final class SystemPropertiesUtils {
public static String getProperty(String key, String defaultValue) {
String value = defaultValue;
try {
Class<?> c = Class.forName(CLASS_NAME);
Method get = c.getMethod("get", String.class, String.class);
value = (String) (get.invoke(c, key, defaultValue));
return value;
} catch (Exception e) {
e.printStackTrace();
} finally {
return value;
}
return value;
}
public static void setProperty(String key, String value) {

11
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeTransformUtils.java
View File

@@ -19,11 +19,14 @@ public final class TimeTransformUtils {
int hours = totalSeconds / 3600;
StringBuilder stringBuilder = new StringBuilder();
Formatter mFormatter = new Formatter(stringBuilder, Locale.getDefault());
String formatStr;
if (hours > 0) {
return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
formatStr = mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
} else {
return mFormatter.format("%02d:%02d", minutes, seconds).toString();
formatStr = mFormatter.format("%02d:%02d", minutes, seconds).toString();
}
mFormatter.close();
return formatStr;
}
public static String stringForTimeWithHours(int timeMs) {
@@ -36,7 +39,9 @@ public final class TimeTransformUtils {
int hours = totalSeconds / 3600;
StringBuilder stringBuilder = new StringBuilder();
Formatter mFormatter = new Formatter(stringBuilder, Locale.getDefault());
return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
String formatStr = mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
mFormatter.close();
return formatStr;
}

51
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ZipUtils.java
View File

@@ -62,18 +62,11 @@ public final class ZipUtils {
final String comment)
throws IOException {
if (srcFilePaths == null || zipFilePath == null) return false;
ZipOutputStream zos = null;
try {
zos = new ZipOutputStream(new FileOutputStream(zipFilePath));
try(ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFilePath))) {
for (String srcFile : srcFilePaths) {
if (!zipFile(UtilsBridge.getFileByPath(srcFile), "", zos, comment)) return false;
}
return true;
} finally {
if (zos != null) {
zos.finish();
zos.close();
}
}
}
@@ -104,18 +97,11 @@ public final class ZipUtils {
final String comment)
throws IOException {
if (srcFiles == null || zipFile == null) return false;
ZipOutputStream zos = null;
try {
zos = new ZipOutputStream(new FileOutputStream(zipFile));
try(ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
for (File srcFile : srcFiles) {
if (!zipFile(srcFile, "", zos, comment)) return false;
}
return true;
} finally {
if (zos != null) {
zos.finish();
zos.close();
}
}
}
@@ -177,14 +163,8 @@ public final class ZipUtils {
final String comment)
throws IOException {
if (srcFile == null || zipFile == null) return false;
ZipOutputStream zos = null;
try {
zos = new ZipOutputStream(new FileOutputStream(zipFile));
try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
return zipFile(srcFile, "", zos, comment);
} finally {
if (zos != null) {
zos.close();
}
}
}
@@ -207,22 +187,16 @@ public final class ZipUtils {
}
}
} else {
InputStream is = null;
try {
is = new BufferedInputStream(new FileInputStream(srcFile));
try (InputStream is = new BufferedInputStream(new FileInputStream(srcFile))) {
ZipEntry entry = new ZipEntry(rootPath);
entry.setComment(comment);
zos.putNextEntry(entry);
byte buffer[] = new byte[BUFFER_LEN];
byte[] buffer = new byte[BUFFER_LEN];
int len;
while ((len = is.read(buffer, 0, BUFFER_LEN)) != -1) {
zos.write(buffer, 0, len);
}
zos.closeEntry();
} finally {
if (is != null) {
is.close();
}
}
}
return true;
@@ -330,23 +304,12 @@ public final class ZipUtils {
return UtilsBridge.createOrExistsDir(file);
} else {
if (!UtilsBridge.createOrExistsFile(file)) return false;
InputStream in = null;
OutputStream out = null;
try {
in = new BufferedInputStream(zip.getInputStream(entry));
out = new BufferedOutputStream(new FileOutputStream(file));
byte buffer[] = new byte[BUFFER_LEN];
try (InputStream in = new BufferedInputStream(zip.getInputStream(entry)); OutputStream out = new BufferedOutputStream(new FileOutputStream(file))) {
byte[] buffer = new byte[BUFFER_LEN];
int len;
while ((len = in.read(buffer)) != -1) {
out.write(buffer, 0, len);
}
} finally {
if (in != null) {
in.close();
}
if (out != null) {
out.close();
}
}
}
return true;

16
libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/element/M3DCar.java
View File

@@ -6,13 +6,13 @@ import java.io.DataInputStream;
import java.io.IOException;
public class M3DCar {
private Context context;
private int resid;
private final Context context;
private final int redis;
public byte[] totBuffer = null;
public int totSize = 0;
public M3DCar(Context context, int resid) {
this.resid = resid;
public M3DCar(Context context, int redis) {
this.redis = redis;
this.context = context;
loadData();
}
@@ -20,12 +20,12 @@ public class M3DCar {
private void loadData() {
if (null != totBuffer)
return;
DataInputStream dis = new DataInputStream(context.getResources().openRawResource(resid));
;
int curTotSize = 64 * 1024;
totBuffer = new byte[curTotSize];
byte[] buffer = new byte[1024];
int size = 0;
try {
int size;
try(DataInputStream dis = new DataInputStream(context.getResources().openRawResource(redis))) {
while ((size = dis.read(buffer)) >= 0) {
if (totSize + size > curTotSize) {
curTotSize = (totSize + size) * 3 / 2;
@@ -36,8 +36,8 @@ public class M3DCar {
System.arraycopy(buffer, 0, totBuffer, totSize, size);
totSize += size;
}
dis.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}

4
libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/DirectionLayer.java
View File

@@ -23,8 +23,8 @@ public class DirectionLayer extends ImageView implements MapStatusListener {
private static final String TAG = "DirectionLayer";
private Drawable icon;
private IMapController mMapController;
private Matrix matrix = new Matrix();
private Camera mCamera = new Camera();
private final Matrix matrix = new Matrix();
private final Camera mCamera = new Camera();
public DirectionLayer(Context context){
super(context);

10
libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/MainInfo.java
View File

@@ -7,7 +7,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
public class MainInfo {
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
private static MainInfo m_hinst = null;
private boolean mbUserLog = true;
private static boolean mbDebug = false;
@@ -33,11 +33,9 @@ public class MainInfo {
if (null == dir) {
return;
}
try {
FileWriter fw = new FileWriter((dir + "log.txt"), true);
try(FileWriter fw = new FileWriter((dir + "log.txt"), true)) {
String date = dateFormat.format(new Date());
fw.write(date + " " + log + "\r\n");
fw.close();
} catch (Exception ex) {
}
}
@@ -50,10 +48,8 @@ public class MainInfo {
if (null == dir) {
return;
}
try {
FileWriter fw = new FileWriter((dir + "log.txt"), true);
try(FileWriter fw = new FileWriter((dir + "log.txt"), true)) {
e.printStackTrace(new PrintWriter(fw));
fw.close();
} catch (Exception ex) {
}
}

30
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/BaseSDCardHelper.java
View File

@@ -79,7 +79,9 @@ public class BaseSDCardHelper {
e.printStackTrace();
} finally {
try {
if (bos != null) {
bos.close();
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -108,7 +110,9 @@ public class BaseSDCardHelper {
e.printStackTrace();
} finally {
try {
if (bos != null) {
bos.close();
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -134,7 +138,9 @@ public class BaseSDCardHelper {
e.printStackTrace();
} finally {
try {
if(bos != null){
bos.close();
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -160,7 +166,9 @@ public class BaseSDCardHelper {
e.printStackTrace();
} finally {
try {
if(bos != null){
bos.close();
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -177,9 +185,9 @@ public class BaseSDCardHelper {
try {
bis = new BufferedInputStream(
new FileInputStream(new File(fileDir)));
new FileInputStream(fileDir));
byte[] buffer = new byte[8 * 1024];
int c = 0;
int c;
while ((c = bis.read(buffer)) != -1) {
baos.write(buffer, 0, c);
baos.flush();
@@ -242,16 +250,16 @@ public class BaseSDCardHelper {
return false;
}
if (path.isFile()) {
path.delete();
return true;
return path.delete();
}
File[] files = path.listFiles();
for (int i = 0; i < files.length; i++) {
deleteAllFilesOfDir(files[i]);
if(files != null){
for (File file : files) {
deleteAllFilesOfDir(file);
}
}
path.delete();
System.out.println("删除文件夹成功");
return true;
return path.delete();
}
/**
* 删除文件夹2
@@ -266,8 +274,10 @@ public class BaseSDCardHelper {
return ;
}
File[] files = path.listFiles();
for (int i = 0; i < files.length; i++) {
deleteAllFilesOfDir(files[i]);
if(files != null){
for (File file : files) {
deleteAllFilesOfDir(file);
}
}
path.delete();
System.out.println("删除文件夹成功");

10
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java
View File

@@ -36,7 +36,6 @@ public class SubscribeInterface {
public SubscribeInterface(@NonNull OnSubscribeInterfaceListener listener) {
this.listener = listener;
if (listener == null) throw new RuntimeException();
init();
}
@@ -62,10 +61,8 @@ public class SubscribeInterface {
* @param role 角色 详情参见{@link Constants.TERMINAL_ROLE}
* @param type 注册类型 详情参见{@link Constants.SUBSCRIBE_TYPE}
* @param messageTypes 要操作的接口
* @return
*/
public boolean subscribeInterface(@Define.TerminalRole int role, @Define.SubscribeType int type, @NonNull Set<MessageType> messageTypes) {
if (messageTypes == null) return false;
MessagePad.SubscribeDataReq.Builder builder = MessagePad.SubscribeDataReq.newBuilder();
builder.setRole(role).setReqType(type);
Map<MessageType, Integer> temp = new HashMap<>();
@@ -89,9 +86,7 @@ public class SubscribeInterface {
}
}
}
return false;
return isSendSucceed;
}
/**
@@ -103,7 +98,6 @@ public class SubscribeInterface {
* @return 是否加入ws发送队列
*/
public boolean subscribeInterface(@Define.TerminalRole int role, @Define.SubscribeType int type, @NonNull MessageType messageType) {
if (messageType == null) return false;
MessagePad.SubscribeDataReq.Builder builder = MessagePad.SubscribeDataReq.newBuilder();
builder.setRole(role).setReqType(type).addDataTypes(messageType.typeCode.getNumber());
boolean isSendSucceed = listener.onSendSubscribe(builder.build().toByteArray());
@@ -120,7 +114,7 @@ public class SubscribeInterface {
subscribedInterface.remove(messageType);
}
}
return false;
return isSendSucceed;
}
//根据参数查询是否已订阅

58
tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
View File

@@ -68,7 +68,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private int curTtsLevel = -1;
// 由于主动打断不会有回调事件，所以主动打断时清掉map中被打断的text和callback
private String curTtsContent = "";
private LinkedList<Pair<String, Integer>> linkedList = new LinkedList<>();
private final LinkedList<Pair<String, Integer>> linkedList = new LinkedList<>();
public void release() {
CallerLogger.d(TAG, "release");
@@ -101,13 +101,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private VoiceClient mVoiceClient;
private MogoVoiceManager mogoVoiceManager;
// 免唤醒指令
private Map<String, List<IMogoTTSCallback>> mCmdMap = new HashMap<>();
private final Map<String, List<IMogoTTSCallback>> mCmdMap = new HashMap<>();
// 问答指令
private Map<String, IMogoTTSCallback> mQAndAMap = new HashMap<>();
private final Map<String, IMogoTTSCallback> mQAndAMap = new HashMap<>();
// 单独的语音播放
private Map<String, IMogoTTSCallback> mSpeakVoiceMap = new HashMap<>();
private final Map<String, IMogoTTSCallback> mSpeakVoiceMap = new HashMap<>();
private Map<String, String[]> mCacheUnWakeupCommands = new ConcurrentHashMap<>();
private final Map<String, String[]> mCacheUnWakeupCommands = new ConcurrentHashMap<>();
private static final String TTS_BACK_RES_ZHILING = "zhilingf_common_back_ce_local.v2.1.0.bin";
private int audioRecorderType = DUILiteConfig.TYPE_COMMON_MIC;
@@ -119,7 +119,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
public static final String TTS_BACK_RES_GUODGM = "guodgm_common_back_ce_local.v2.1.0.bin";
private AILocalTTSEngine mEngine;
private AILocalTTSIntent mAILocalTTSIntent;
private String[] mBackResBinArray = new String[]{TTS_BACK_RES_ZHILING, TTS_BACK_RES_GUODGM};
private final String[] mBackResBinArray = new String[]{TTS_BACK_RES_ZHILING, TTS_BACK_RES_GUODGM};
// 单独的语音播放
private boolean mHasAuth;
private int retryCount;
@@ -277,8 +277,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
/**
* 是否语音注册成功
*
* @return
*/
@Override
public boolean hasFlush() {
@@ -363,8 +361,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
/**
* 语音播报
*
* @param text
*/
public void speakTTSVoice(String text, IMogoTTSCallback callBack) {
if (mEngine != null && mHasAuth) {
@@ -376,9 +372,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
public void stopSpeakTts(String text) {
if (mEngine != null && mHasAuth) {
if (mSpeakVoiceMap.containsKey(text)) {
mSpeakVoiceMap.remove(text);
}
curTtsContent = "";
curTtsLevel = -1;
mEngine.stop();
@@ -387,9 +381,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
public void stopTts() {
if (mEngine != null && mHasAuth) {
if (mSpeakVoiceMap.containsKey(curTtsContent)) {
mSpeakVoiceMap.remove(curTtsContent);
}
// tts过程中调用stop不会有回调事件
curTtsContent = "";
curTtsLevel = -1;
@@ -399,8 +391,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
/**
* 语音播报
*
* @param text
*/
public void speakTTSVoice(String text) {
CallerLogger.d(TAG, "speakTTSVoice");
@@ -493,24 +483,24 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
initFlushStatus();
if (mHasFlush) {
mSpeakVoiceMap.put(text, callBack);
VoiceClient.PreemptType preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_NONE;
if (type != null) {
switch (type) {
case PREEMPT_TYPE_NEXT:
preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_NEXT;
break;
case PREEMPT_TYPE_FLUSH:
preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_FLUSH;
break;
case PREEMPT_TYPE_IMMEDIATELY:
preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_IMMEADIATELY;
break;
case PREEMPT_TYPE_IMMEDIATELY_WITHOUT_CANCEL:
preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_IMMEADIATELY_WITHOUT_CANCLE;
break;
}
}
speakTTSVoice(text);
// VoiceClient.PreemptType preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_NONE;
// if (type != null) {
// switch (type) {
// case PREEMPT_TYPE_NEXT:
// preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_NEXT;
// break;
// case PREEMPT_TYPE_FLUSH:
// preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_FLUSH;
// break;
// case PREEMPT_TYPE_IMMEDIATELY:
// preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_IMMEADIATELY;
// break;
// case PREEMPT_TYPE_IMMEDIATELY_WITHOUT_CANCEL:
// preemptType = VoiceClient.PreemptType.PREEMPT_TYPE_IMMEADIATELY_WITHOUT_CANCLE;
// break;
// }
// }
// mVoiceClient.speakTypeText( text, preemptType );
}
} catch (Exception e) {
@@ -679,7 +669,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
CallerLogger.d(TAG, "txz is voiceServiceReady");
return true;
}
return true;
return false;
}
public void speakTTSAndDuck(String text) {