Browse Source

修改部分报错

Pq 1 year ago
parent
commit
8ddcde2807

+ 7 - 1
BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -19,7 +19,13 @@ public abstract class WebConstants {
     public static final String WEB_SOCKET_URL_RELEASE = "wss://online.colexiu.com/audioAnalysis";
     public static final String WEB_SOCKET_URL_PRERELEASE = "wss://ponline.colexiu.com/audioAnalysis";
 
-
+    public static String getCustomUAParams() {
+        if(BaseApplication.Companion.isTeacherClient()){
+            return WEB_UA_PARAMS_TEACHER;
+        }else{
+            return WEB_UA_PARAMS_STUDENT;
+        }
+    }
     public static String getWebSocketUrl() {
         if (TextUtils.equals("preRelease", BuildConfig.BUILD_TYPE)) {
             Log.i("WebConstants", "return webSocket:" + WEB_SOCKET_URL_PRERELEASE);

+ 13 - 0
BaseLibrary/src/main/java/com/cooleshow/base/recorder/BaseDataRecorder.java

@@ -6,6 +6,7 @@ import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.media.AudioRecord;
 import android.os.Build;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,6 +25,7 @@ public class BaseDataRecorder implements Recorder {
     protected PullTransport pullTransport;
     protected AudioRecordConfig config;
     protected int bufferSizeInBytes;// 缓冲区大小
+    protected float bufferDuration;// 一个buffer缓冲区需要的时间
     protected File file;
 
     private AudioRecord audioRecord;
@@ -41,6 +43,12 @@ public class BaseDataRecorder implements Recorder {
                 config.getChannelConfig(),
                 config.getAudioFormat()
         );
+
+        //bufferSizeInBytes/(44100*16/8)*1000
+        float durationUnit = (config.getSampleRateInHz() * config.bitsPerSample()) / 8;
+        bufferDuration = bufferSizeInBytes / durationUnit * 1000;
+        Log.i("BaseData", "bufferDuration:" + bufferDuration);
+        Log.i("BaseData", "bufferSizeInBytes:" + bufferSizeInBytes);
     }
 
     @Override
@@ -118,4 +126,9 @@ public class BaseDataRecorder implements Recorder {
         }
     }
 
+    @Override
+    public float getBufferDuration() {
+        return bufferDuration;
+    }
+
 }

+ 1 - 1
BaseLibrary/src/main/java/com/cooleshow/base/recorder/Recorder.java

@@ -32,5 +32,5 @@ public interface Recorder {
      */
     void stopRecording();
 
-
+    float getBufferDuration();
 }

+ 13 - 0
BaseLibrary/src/main/java/com/cooleshow/base/utils/FileUtils.java

@@ -2009,4 +2009,17 @@ public final class FileUtils {
             }
         }
     }
+
+    /**
+     * 删除文件
+     *
+     * @param path
+     */
+    public static void deleteFile(String path) {
+        if (TextUtils.isEmpty(path)) {
+            return;
+        }
+        File file = new File(path);
+        deleteFile(file);
+    }
 }

+ 1 - 0
accompany/build.gradle

@@ -62,6 +62,7 @@ dependencies {
     api project(path: ':midiplaylib')
     api project(path: ':musictuner')
     api project(path: ':metronome')
+    implementation project(path: ':chatModule')
 //    implementation project(path: ':rong_im:kit')
     //ARouter
     implementation "com.alibaba:arouter-api:$rootProject.ext.android.arouter_api_version"

+ 2 - 1
accompany/src/main/java/com/daya/orchestra/accompany/web/AccompanyFragment.java

@@ -65,6 +65,7 @@ import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.LollipopFixedWebView;
 import com.cooleshow.base.widgets.ViewConvertListener;
 import com.cooleshow.base.widgets.ViewHolder;
+import com.cooleshow.chatmodule.constants.TCChatRouterPath;
 import com.cooleshow.musictuner.utils.MusicTunerHelper;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.orchestra.accompany.BuildConfig;
@@ -1543,7 +1544,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                 if (share_media == null) {
                                     if (TextUtils.equals(snsPlatform.mKeyword, "chat")) {
                                         //分享群聊
-                                        ARouter.getInstance().build(RouterPath.ChatCenter.CHAT_SELECT_CONTACT)
+                                        ARouter.getInstance().build(TCChatRouterPath.CHAT_SELECT_CONTACT)
                                                 .navigation(getActivity(), SHARE_CHAT_REQUEST_CODE);
                                     } else if (TextUtils.equals(snsPlatform.mKeyword, "copy")) {
                                         if (!TextUtils.isEmpty(shareUrl)) {