瀏覽代碼

1.2.1版本

Pq 2 年之前
父節點
當前提交
4580a4a801

+ 3 - 1
live_teaching/src/main/java/com/daya/live_teaching/rtc/RtcManager.java

@@ -170,7 +170,9 @@ public class RtcManager {
         if (rcrtcRoom == null) {
             return;
         }
-        rcrtcRoom.getLocalUser().unpublishDefaultLiveStreams(resultCallback);
+        if (rcrtcRoom.getLocalUser() != null) {
+            rcrtcRoom.getLocalUser().unpublishDefaultLiveStreams(resultCallback);
+        }
     }
 
 

+ 2 - 2
student/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.cooleshow.student"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 120
-        versionName "1.2.0"
+        versionCode 121
+        versionName "1.2.1"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"

+ 3 - 2
student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java

@@ -36,6 +36,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.bean.WxPayResult;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
@@ -1588,7 +1589,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                 if (file.exists() && file.length() > 0) {
                                     //本地文件存在
                                     midiFilePath = file.getAbsolutePath();
-                                    MidiPlayerUtils.getInstance().init(getActivity().getApplication(), midiFilePath);
+                                    MidiPlayerUtils.getInstance().init(BaseApplication.context, midiFilePath);
                                     double tempDuration = MidiPlayerUtils.getInstance().getTotalLength2Second();
                                     if (Math.abs(midiFileDuration - tempDuration * 1000) > 2000) {
                                         midiFileDuration = (long) (tempDuration * 1000);
@@ -1615,7 +1616,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                     if (MyFileUtils.writeFileToSDCard(response, path, name)) {
                                                         runOnUiThread(() -> {
                                                             midiFilePath = path + File.separator + name;
-                                                            MidiPlayerUtils.getInstance().init(getActivity().getApplication(), midiFilePath);
+                                                            MidiPlayerUtils.getInstance().init(BaseApplication.context, midiFilePath);
                                                             double tempDuration = MidiPlayerUtils.getInstance().getTotalLength2Second();
                                                             if (Math.abs(midiFileDuration - tempDuration * 1000) > 2000) {
                                                                 midiFileDuration = (long) (tempDuration * 1000);

+ 2 - 2
teacher/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "com.cooleshow.teacher"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 120
-        versionName "1.2.0"
+        versionCode 121
+        versionName "1.2.1"
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
         }

+ 9 - 0
teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -405,6 +405,15 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     }
 
     public void getTeacherInfoSuccess(TeacherUserInfo teacherUserInfo) {
+        if (teacherUserInfo == null) {
+            return;
+        }
+        if (isDetached() || !isAdded()) {
+            return;
+        }
+        if (mViewBinding == null || mViewBinding.tvTeacherName == null) {
+            return;
+        }
         //昵称
         if (teacherUserInfo != null) {
             String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyFragment.java

@@ -37,6 +37,7 @@ import com.airbnb.lottie.LottieAnimationView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.bean.WxPayResult;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
@@ -1591,7 +1592,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                 if (file.exists() && file.length() > 0) {
                                     //本地文件存在
                                     midiFilePath = file.getAbsolutePath();
-                                    MidiPlayerUtils.getInstance().init(getActivity().getApplication(), midiFilePath);
+                                    MidiPlayerUtils.getInstance().init(BaseApplication.context, midiFilePath);
                                     double tempDuration = MidiPlayerUtils.getInstance().getTotalLength2Second();
                                     if (Math.abs(midiFileDuration - tempDuration * 1000) > 2000) {
                                         midiFileDuration = (long) (tempDuration * 1000);
@@ -1618,7 +1619,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                     if (MyFileUtils.writeFileToSDCard(response, path, name)) {
                                                         runOnUiThread(() -> {
                                                             midiFilePath = path + File.separator + name;
-                                                            MidiPlayerUtils.getInstance().init(getActivity().getApplication(), midiFilePath);
+                                                            MidiPlayerUtils.getInstance().init(BaseApplication.context, midiFilePath);
                                                             double tempDuration = MidiPlayerUtils.getInstance().getTotalLength2Second();
                                                             if (Math.abs(midiFileDuration - tempDuration * 1000) > 2000) {
                                                                 midiFileDuration = (long) (tempDuration * 1000);