Selaa lähdekoodia

新增老师端首页进入课程的动画效果

Pq 3 vuotta sitten
vanhempi
commit
678b17bd9e

BIN
teacher/src/main/assets/lottie/home/live_course/images/___2C8A75BF-2B66-4F7D-8BC4-EF07BC7C0955.png


BIN
teacher/src/main/assets/lottie/home/live_course/images/___5___6B54FD2C-7988-4205-B85F-61714D7C29B4.png


BIN
teacher/src/main/assets/lottie/home/live_course/images/_____31_9F12D397-DA84-4B91-9C4B-642DA07045E9.png


BIN
teacher/src/main/assets/lottie/home/piano_course/images/___5B0AE074-7E19-4A0D-B01C-380BFC0BE94D.png


BIN
teacher/src/main/assets/lottie/home/piano_course/images/___5___E15887AE-0472-48F6-B4BF-7310E071A33C.png


BIN
teacher/src/main/assets/lottie/home/piano_course/images/_____31_550B3F9A-BC60-4669-A0A0-5E315687C2EA.png


BIN
teacher/src/main/assets/lottie/home/sparring_course/images/___5___C8C7A749-87DC-4D99-8F67-2AD2B1D3D5F6.png


BIN
teacher/src/main/assets/lottie/home/sparring_course/images/___8101F90E-EF42-445A-9B5B-29F652562925.png


BIN
teacher/src/main/assets/lottie/home/sparring_course/images/_____31_5E671E04-92B5-414C-A363-CBBFEF2421E6.png


+ 31 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -238,9 +238,11 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         }
         }
         mRecentCourses = bean.recentCourses;
         mRecentCourses = bean.recentCourses;
         presenter.helpCenterContentList();
         presenter.helpCenterContentList();
+        mViewBinding.ivCourseEnterAnim.clearAnimation();
         mViewBinding.flCourseEnter.setVisibility(mRecentCourses != null ? View.VISIBLE : View.GONE);
         mViewBinding.flCourseEnter.setVisibility(mRecentCourses != null ? View.VISIBLE : View.GONE);
+        handleEnterAnim();
         if (mRecentCourses != null) {
         if (mRecentCourses != null) {
-            mViewBinding.tvLiveTitle.setText(mRecentCourses.courseGroupName + "即将开始");
+//            mViewBinding.tvLiveTitle.setText(mRecentCourses.courseGroupName + "即将开始");
             String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
             String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
             String startTime = TimeUtils.date2String(
             String startTime = TimeUtils.date2String(
                     TimeUtils.getDate(mRecentCourses.courseStartTime),
                     TimeUtils.getDate(mRecentCourses.courseStartTime),
@@ -259,6 +261,34 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         }
         }
     }
     }
 
 
+    private void handleEnterAnim() {
+        if (mRecentCourses == null) {
+            mViewBinding.ivCourseEnterAnim.setVisibility(View.GONE);
+            return;
+        }
+        mViewBinding.ivCourseEnterAnim.setVisibility(View.VISIBLE);
+        String assetFolder = "lottie/home/sparring_course/images/";
+        int rawRes = R.raw.home_sparring_course_enter;
+        if (TextUtils.equals(mRecentCourses.courseType, CourseConstants.LIVE_COURSE)) {
+            assetFolder = "lottie/home/live_course/images/";
+            rawRes = R.raw.home_live_course_enter;
+        }
+        if (TextUtils.equals(mRecentCourses.courseType, CourseConstants.OTHER_COURSE)) {
+            //陪练课
+            assetFolder = "lottie/home/sparring_course/images/";
+            rawRes = R.raw.home_sparring_course_enter;
+        }
+        if (TextUtils.equals(mRecentCourses.courseType, CourseConstants.PIANO_ROOM_COURSE)) {
+            //琴房课
+            assetFolder = "lottie/home/piano_course/images/";
+            rawRes = R.raw.home_piano_course_enter;
+        }
+        mViewBinding.ivCourseEnterAnim.setImageAssetsFolder(assetFolder);
+        mViewBinding.ivCourseEnterAnim.setAnimation(rawRes);
+        mViewBinding.ivCourseEnterAnim.playAnimation();
+
+    }
+
     /**
     /**
      * 跳转直播课详情页面
      * 跳转直播课详情页面
      *
      *

+ 5 - 6
teacher/src/main/res/layout/fragment_new_home_layout.xml

@@ -384,9 +384,9 @@
                     android:id="@+id/fl_course_enter"
                     android:id="@+id/fl_course_enter"
                     android:layout_width="match_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="25dp"
+                    android:layout_marginStart="14dp"
                     android:layout_marginTop="24dp"
                     android:layout_marginTop="24dp"
-                    android:layout_marginEnd="25dp"
+                    android:layout_marginEnd="14dp"
                     android:visibility="gone"
                     android:visibility="gone"
                     app:cardBackgroundColor="@color/white"
                     app:cardBackgroundColor="@color/white"
                     app:cardCornerRadius="10dp"
                     app:cardCornerRadius="10dp"
@@ -403,7 +403,7 @@
                             android:id="@+id/tv_live_title"
                             android:id="@+id/tv_live_title"
                             android:layout_width="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="120dp"
+                            android:layout_marginStart="128dp"
                             android:includeFontPadding="false"
                             android:includeFontPadding="false"
                             android:text="您有新课程即将开始"
                             android:text="您有新课程即将开始"
                             android:textColor="@color/color_1a1a1a"
                             android:textColor="@color/color_1a1a1a"
@@ -454,9 +454,8 @@
 
 
                 <com.airbnb.lottie.LottieAnimationView
                 <com.airbnb.lottie.LottieAnimationView
                     android:id="@+id/iv_course_enter_anim"
                     android:id="@+id/iv_course_enter_anim"
-                    android:layout_width="105dp"
-                    android:layout_height="83dp"
-                    android:layout_marginStart="11dp"
+                    android:layout_width="128dp"
+                    android:layout_height="91dp"
                     android:visibility="gone"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="@+id/fl_course_enter"
                     app:layout_constraintBottom_toBottomOf="@+id/fl_course_enter"
                     app:layout_constraintLeft_toLeftOf="@+id/fl_course_enter"
                     app:layout_constraintLeft_toLeftOf="@+id/fl_course_enter"

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
teacher/src/main/res/raw/home_live_course_enter.json


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
teacher/src/main/res/raw/home_piano_course_enter.json


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
teacher/src/main/res/raw/home_sparring_course_enter.json


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä