修复bug

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TeachingToolsFragment.java

@@ -212,9 +212,10 @@ public class TeachingToolsFragment extends BaseFragment<FragmentTeachingToolsBin
         classViewModel.getQueryNoJoinStu().observe(this, new Observer<List<ClassMember>>() {
             @Override
             public void onChanged(List<ClassMember> classMembers) {
-                noJoinStuClassMembers.clear();
-                noJoinStuClassMembers.addAll(classMembers);
-
+                if (noJoinStuClassMembers != null) {
+                    noJoinStuClassMembers.clear();
+                    noJoinStuClassMembers.addAll(classMembers);
+                }
             }
         });
         classViewModel.getExamSongDownloadClassMember().observe(this, new Observer<VideoClassMemberData>() {
@@ -241,7 +242,7 @@ public class TeachingToolsFragment extends BaseFragment<FragmentTeachingToolsBin
         int value = SizeUtils.dp2px(44);
         int marginLeft = SizeUtils.dp2px(10);
         for (Operate operate : Operate.values()) {
-            if (operate== Operate.ACCOMPANIMENT || operate== Operate.ACCOMPANIMENT_SETTING) {
+            if (operate == Operate.ACCOMPANIMENT || operate == Operate.ACCOMPANIMENT_SETTING) {
                 //暂时隐藏伴奏和伴奏下载
                 continue;
             }

student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java

@@ -302,7 +302,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                 if (webSocketClient.isClosed()) {
                                     webSocketClient.reconnectBlocking();
                                 } else {
-                                    webSocketClient.connectBlocking();
+                                    webSocketClient.reconnectBlocking();
                                 }
                             } else if (webSocketClient.getReadyState() == ReadyState.CLOSED) {
                                 webSocketClient.reconnectBlocking();
@@ -1865,14 +1865,14 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
     public void savePicture(String base64, String uuid) {
         try {
             File file = com.cooleshow.base.utils.FileUtils.saveBase64ImgToLocalFile(base64);
-            sendSavePicCallBack("savePicture", "success",uuid);
+            sendSavePicCallBack("savePicture", "success", uuid);
         } catch (Exception e) {
-            sendSavePicCallBack("savePicture", "fail",uuid);
+            sendSavePicCallBack("savePicture", "fail", uuid);
             e.printStackTrace();
         }
     }
 
-    private void sendSavePicCallBack(String api, String result,String uuid) {
+    private void sendSavePicCallBack(String api, String result, String uuid) {
         JSONObject jsonObject = new JSONObject();
         JSONObject contentJson = new JSONObject();
         try {

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java

@@ -96,7 +96,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
     @Override
     public void onResume() {
         super.onResume();
-        if(isFirstLoad){
+        if (isFirstLoad) {
             isFirstLoad = false;
             reBuildFilter(null, CourseConstants.COURSE_FILTER_ALL);
         }
@@ -120,7 +120,9 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
         currentFilterDate = targetDateTimeStr;
         currentCourseFilterStatus = !TextUtils.isEmpty(status) ? status : CourseConstants.COURSE_FILTER_ALL;
         currentPage = 1;
-        mViewBinding.tvTime.setText(currentFilterDate);
+        if (mViewBinding != null) {
+            mViewBinding.tvTime.setText(currentFilterDate);
+        }
         queryCourse(true);
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveListActivity.java

@@ -46,7 +46,7 @@ public class LiveListActivity extends BaseActivity<ActivityLiveListLayoutBinding
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课后作业");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "开启直播");
         viewBinding.toolbarInclude.tvRightText.setVisibility(View.VISIBLE);
         viewBinding.toolbarInclude.tvRightText.setText("创建直播");
         viewBinding.toolbarInclude.tvRightText.setOnClickListener(this);

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -86,6 +86,12 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     protected void initView(View rootView) {
         auditStatus = getArguments().getString("auditStatus");
         musicianAuthStatus = getArguments().getString("musicianAuthStatus");
+        if(TextUtils.isEmpty(auditStatus)){
+            auditStatus = "PASS";
+        }
+        if(TextUtils.isEmpty(musicianAuthStatus)){
+            musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_PASS;
+        }
         RecyclerView rvAddress = mViewBinding.recyclerView;
         mViewBinding.llUploadScore.setOnClickListener(this);
         LinearLayoutManager manager = new LinearLayoutManager(getContext());

teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyFragment.java

@@ -301,7 +301,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                 if (webSocketClient.isClosed()) {
                                     webSocketClient.reconnectBlocking();
                                 } else {
-                                    webSocketClient.connectBlocking();
+                                    webSocketClient.reconnectBlocking();
                                 }
                             } else if (webSocketClient.getReadyState() == ReadyState.CLOSED) {
                                 webSocketClient.reconnectBlocking();