增加云教练进入时的loading

student/src/main/java/com/cooleshow/student/adapter/VideoCourseListAdapter.java

@@ -35,6 +35,8 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<SelectMyGroupBean.R
         GlideUtils.INSTANCE.loadImage(getContext(), data.avatar, cir_avatar);
         //老师名称
         holder.setText(R.id.tv_author_name, data.username);
+        //声部
+        holder.setText(R.id.course_name,data.lessonSubjectName);
         //购买人数
         holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent+""));
         //￥120/4课时

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

@@ -358,6 +358,40 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
 
     }
 
+    @Override
+    public void cloudLoading(JSONObject jsonObject) {
+        try {
+            JSONObject content = jsonObject.getJSONObject("content");
+            boolean show = content.optBoolean("show", false);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (show) {
+                            showLoadingAnim();
+                        } else {
+                            hideLoadingAnim();
+                        }
+                    }
+                });
+            }
+            onSendMessage(jsonObject.toString());
+        } catch (Exception e) {
+            hideLoadingAnim();
+            e.printStackTrace();
+        }
+    }
+
+    private void showLoadingAnim() {
+        mViewBinding.llLoading.setVisibility(View.VISIBLE);
+        mViewBinding.viewLoadingAnim.playAnimation();
+    }
+
+    private void hideLoadingAnim() {
+        mViewBinding.viewLoadingAnim.clearAnimation();
+        mViewBinding.llLoading.setVisibility(View.GONE);
+    }
+
     JSONObject msg = null;
 
     private void startWebSocketClient(JSONObject message) throws JSONException {

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -55,7 +55,11 @@ public class JsInterfaceAccomPanyUtils extends Object {
                             .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
                             .navigation();
                     activity.finish();
-                } else if ("openConversationActivity".equals(api)) {
+                }  else if("cloudLoading".equals(api)){
+                    if (onListener != null) {
+                        onListener.cloudLoading(jsonObject);
+                    }
+                }else if ("openConversationActivity".equals(api)) {
                     JSONObject contentBean = jsonObject.getJSONObject("content");
                     if (null != contentBean) {
                         RongIM.getInstance().startPrivateChat(activity, contentBean.getString("userId"), contentBean.getString("name"));
@@ -340,6 +344,8 @@ public class JsInterfaceAccomPanyUtils extends Object {
 
         void startEvaluating(JSONObject message);
 
+        void cloudLoading(JSONObject message);
+
 
         void startRecording(JSONObject message);
 

student/src/main/res/layout/fragment_accompany.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,34 @@
         android:layout_height="match_parent"
         android:scrollbars="none" />
 
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_accompany_loading"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/view_loading_anim"
+            android:layout_width="300dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_shop_car"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_shop_car"
+            app:layout_constraintRight_toRightOf="@+id/iv_shop_car"
+            app:lottie_autoPlay="false"
+            app:lottie_imageAssetsFolder="lottie/accompany/images/"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/accompany_loading" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="加载中..."
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_18" />
+    </LinearLayout>
+</FrameLayout>

student/src/main/res/layout/item_video_course_list_layout.xml

@@ -15,6 +15,21 @@
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_corner_radius="5dp" />
 
+    <TextView
+        android:id="@+id/course_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:layout_marginTop="@dimen/dp_7"
+        android:background="@drawable/gray_1_radius_bg"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_4"
+        android:paddingRight="@dimen/dp_4"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_bg" />
+
 <!--    <View-->
 <!--        android:layout_width="match_parent"-->
 <!--        android:layout_height="0dp"-->

teacher/src/main/java/com/cooleshow/teacher/adapter/VideoCourseListAdapter.java

@@ -36,6 +36,8 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean
         holder.setText(R.id.tv_author_name, data.username);
         //购买人数
         holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent));
+        //声部
+        holder.setText(R.id.course_name,data.lessonSubjectName);
         //￥120/4课时
         String price =UiUtils.getVideoCoursePriceText(data.lessonPrice, data.lessonCount);
         holder.setText(R.id.tv_price, price);

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

@@ -33,6 +33,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.airbnb.lottie.LottieAnimationView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.bean.WxPayResult;
@@ -362,6 +363,40 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
 
     }
 
+    @Override
+    public void cloudLoading(JSONObject jsonObject) {
+        try {
+            JSONObject content = jsonObject.getJSONObject("content");
+            boolean show = content.optBoolean("show", false);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (show) {
+                            showLoadingAnim();
+                        } else {
+                            hideLoadingAnim();
+                        }
+                    }
+                });
+            }
+            onSendMessage(jsonObject.toString());
+        } catch (Exception e) {
+            hideLoadingAnim();
+            e.printStackTrace();
+        }
+    }
+
+    private void showLoadingAnim() {
+        mViewBinding.llLoading.setVisibility(View.VISIBLE);
+        mViewBinding.viewLoadingAnim.playAnimation();
+    }
+
+    private void hideLoadingAnim() {
+        mViewBinding.viewLoadingAnim.clearAnimation();
+        mViewBinding.llLoading.setVisibility(View.GONE);
+    }
+
     JSONObject msg = null;
 
     private void startWebSocketClient(JSONObject message) throws JSONException {
@@ -1561,7 +1596,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                     if (Math.abs(midiFileDuration - tempDuration * 1000) > 2000) {
                                         midiFileDuration = (long) (tempDuration * 1000);
                                     }
-                                    JSONObject contentJsonObject =message.optJSONObject("content");
+                                    JSONObject contentJsonObject = message.optJSONObject("content");
                                     if (contentJsonObject != null) {
                                         contentJsonObject.put("midiDuration", midiFileDuration);
                                         contentJsonObject.put("midi", EncodeUtils.urlEncode(midiFile));
@@ -1589,7 +1624,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                                                                 midiFileDuration = (long) (tempDuration * 1000);
                                                             }
                                                             try {
-                                                                JSONObject contentJsonObject =message.optJSONObject("content");
+                                                                JSONObject contentJsonObject = message.optJSONObject("content");
                                                                 if (contentJsonObject != null) {
                                                                     contentJsonObject.put("midiDuration", midiFileDuration);
                                                                     contentJsonObject.put("midi", EncodeUtils.urlEncode(midiFile));

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -52,7 +52,11 @@ public class JsInterfaceAccomPanyUtils extends Object {
                 } else if ("login".equals(api)) {
                     UserHelper.logout();
                     activity.finish();
-                } else if ("openConversationActivity".equals(api)) {
+                } else if("cloudLoading".equals(api)){
+                    if (onListener != null) {
+                        onListener.cloudLoading(jsonObject);
+                    }
+                }else if ("openConversationActivity".equals(api)) {
                     JSONObject contentBean = jsonObject.getJSONObject("content");
                     if (null != contentBean) {
                         RongIM.getInstance().startPrivateChat(activity, contentBean.getString("userId"), contentBean.getString("name"));
@@ -337,6 +341,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
 
         void startEvaluating(JSONObject message);
 
+        void cloudLoading(JSONObject jsonObject);
 
         void startRecording(JSONObject message);
 

teacher/src/main/res/layout/fragment_accompany.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,35 @@
         android:layout_height="match_parent"
         android:scrollbars="none" />
 
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/ll_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_accompany_loading"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/view_loading_anim"
+            android:layout_width="300dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_shop_car"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_shop_car"
+            app:layout_constraintRight_toRightOf="@+id/iv_shop_car"
+            app:lottie_autoPlay="false"
+            app:lottie_imageAssetsFolder="lottie/accompany/images/"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/accompany_loading" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="加载中..."
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_18" />
+    </LinearLayout>
+
+</FrameLayout>

teacher/src/main/res/layout/item_video_course_list_layout.xml

@@ -15,6 +15,22 @@
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_corner_radius="5dp" />
 
+
+    <TextView
+        android:id="@+id/course_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:layout_marginTop="@dimen/dp_7"
+        android:background="@drawable/gray_1_radius_bg"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_4"
+        android:paddingRight="@dimen/dp_4"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_bg" />
+
 <!--    <View-->
 <!--        android:layout_width="match_parent"-->
 <!--        android:layout_height="0dp"-->