[sonar] merge

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

@@ -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>

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

@@ -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);
-        resultFile = new File(path);
+        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:
-                    startMp3Recorder();
-                    break;
-                default:
-                    startPcmRecorder();
-                    break;
+            if (currentConfig.getFormat() == RecordConfig.RecordFormat.MP3) {
+                startMp3Recorder();
+            } else {
+                startPcmRecorder();
             }
         }
 
@@ -275,12 +272,9 @@ public class RecordHelper {
 
     private void stopMp3Encoded() {
         if (mp3EncodeThread != null) {
-            mp3EncodeThread.stopSafe(new Mp3EncodeThread.EncordFinishListener() {
-                @Override
-                public void onFinish() {
-                    notifyFinish();
-                    mp3EncodeThread = null;
-                }
+            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() {