Forráskód Böngészése

添加老师端学生端开屏动画

Pq 2 éve
szülő
commit
90c4fefce9
97 módosított fájl, 72 hozzáadás és 21 törlés
  1. 1 0
      BaseLibrary/build.gradle
  2. BIN
      student/src/main/assets/lottie/splash/images/img_0.png
  3. BIN
      student/src/main/assets/lottie/splash/images/img_1.png
  4. BIN
      student/src/main/assets/lottie/splash/images/img_10.png
  5. BIN
      student/src/main/assets/lottie/splash/images/img_11.png
  6. BIN
      student/src/main/assets/lottie/splash/images/img_12.png
  7. BIN
      student/src/main/assets/lottie/splash/images/img_13.png
  8. BIN
      student/src/main/assets/lottie/splash/images/img_14.png
  9. BIN
      student/src/main/assets/lottie/splash/images/img_15.png
  10. BIN
      student/src/main/assets/lottie/splash/images/img_16.png
  11. BIN
      student/src/main/assets/lottie/splash/images/img_17.png
  12. BIN
      student/src/main/assets/lottie/splash/images/img_18.png
  13. BIN
      student/src/main/assets/lottie/splash/images/img_19.png
  14. BIN
      student/src/main/assets/lottie/splash/images/img_2.png
  15. BIN
      student/src/main/assets/lottie/splash/images/img_20.png
  16. BIN
      student/src/main/assets/lottie/splash/images/img_21.png
  17. BIN
      student/src/main/assets/lottie/splash/images/img_22.png
  18. BIN
      student/src/main/assets/lottie/splash/images/img_23.png
  19. BIN
      student/src/main/assets/lottie/splash/images/img_24.png
  20. BIN
      student/src/main/assets/lottie/splash/images/img_25.png
  21. BIN
      student/src/main/assets/lottie/splash/images/img_26.png
  22. BIN
      student/src/main/assets/lottie/splash/images/img_27.png
  23. BIN
      student/src/main/assets/lottie/splash/images/img_28.png
  24. BIN
      student/src/main/assets/lottie/splash/images/img_29.png
  25. BIN
      student/src/main/assets/lottie/splash/images/img_3.png
  26. BIN
      student/src/main/assets/lottie/splash/images/img_30.png
  27. BIN
      student/src/main/assets/lottie/splash/images/img_31.png
  28. BIN
      student/src/main/assets/lottie/splash/images/img_32.png
  29. BIN
      student/src/main/assets/lottie/splash/images/img_33.png
  30. BIN
      student/src/main/assets/lottie/splash/images/img_34.png
  31. BIN
      student/src/main/assets/lottie/splash/images/img_35.png
  32. BIN
      student/src/main/assets/lottie/splash/images/img_36.png
  33. BIN
      student/src/main/assets/lottie/splash/images/img_37.png
  34. BIN
      student/src/main/assets/lottie/splash/images/img_38.png
  35. BIN
      student/src/main/assets/lottie/splash/images/img_39.png
  36. BIN
      student/src/main/assets/lottie/splash/images/img_4.png
  37. BIN
      student/src/main/assets/lottie/splash/images/img_40.png
  38. BIN
      student/src/main/assets/lottie/splash/images/img_41.png
  39. BIN
      student/src/main/assets/lottie/splash/images/img_42.png
  40. BIN
      student/src/main/assets/lottie/splash/images/img_43.png
  41. BIN
      student/src/main/assets/lottie/splash/images/img_44.png
  42. BIN
      student/src/main/assets/lottie/splash/images/img_45.png
  43. BIN
      student/src/main/assets/lottie/splash/images/img_46.png
  44. BIN
      student/src/main/assets/lottie/splash/images/img_47.png
  45. BIN
      student/src/main/assets/lottie/splash/images/img_48.png
  46. BIN
      student/src/main/assets/lottie/splash/images/img_49.png
  47. BIN
      student/src/main/assets/lottie/splash/images/img_5.png
  48. BIN
      student/src/main/assets/lottie/splash/images/img_50.png
  49. BIN
      student/src/main/assets/lottie/splash/images/img_51.png
  50. BIN
      student/src/main/assets/lottie/splash/images/img_52.png
  51. BIN
      student/src/main/assets/lottie/splash/images/img_53.png
  52. BIN
      student/src/main/assets/lottie/splash/images/img_54.png
  53. BIN
      student/src/main/assets/lottie/splash/images/img_55.png
  54. BIN
      student/src/main/assets/lottie/splash/images/img_6.png
  55. BIN
      student/src/main/assets/lottie/splash/images/img_7.png
  56. BIN
      student/src/main/assets/lottie/splash/images/img_8.png
  57. BIN
      student/src/main/assets/lottie/splash/images/img_9.png
  58. 19 0
      student/src/main/java/com/cooleshow/student/ui/splash/SplashActivity.kt
  59. 5 6
      student/src/main/res/drawable/bg_splash.xml
  60. 12 2
      student/src/main/res/layout/activity_splash_layout.xml
  61. 0 0
      student/src/main/res/raw/splash_anim.json
  62. BIN
      teacher/src/main/assets/lottie/splash/images/img_0.png
  63. BIN
      teacher/src/main/assets/lottie/splash/images/img_1.png
  64. BIN
      teacher/src/main/assets/lottie/splash/images/img_10.png
  65. BIN
      teacher/src/main/assets/lottie/splash/images/img_11.png
  66. BIN
      teacher/src/main/assets/lottie/splash/images/img_12.png
  67. BIN
      teacher/src/main/assets/lottie/splash/images/img_13.png
  68. BIN
      teacher/src/main/assets/lottie/splash/images/img_14.png
  69. BIN
      teacher/src/main/assets/lottie/splash/images/img_15.png
  70. BIN
      teacher/src/main/assets/lottie/splash/images/img_16.png
  71. BIN
      teacher/src/main/assets/lottie/splash/images/img_17.png
  72. BIN
      teacher/src/main/assets/lottie/splash/images/img_18.png
  73. BIN
      teacher/src/main/assets/lottie/splash/images/img_19.png
  74. BIN
      teacher/src/main/assets/lottie/splash/images/img_2.png
  75. BIN
      teacher/src/main/assets/lottie/splash/images/img_20.png
  76. BIN
      teacher/src/main/assets/lottie/splash/images/img_21.png
  77. BIN
      teacher/src/main/assets/lottie/splash/images/img_22.png
  78. BIN
      teacher/src/main/assets/lottie/splash/images/img_23.png
  79. BIN
      teacher/src/main/assets/lottie/splash/images/img_24.png
  80. BIN
      teacher/src/main/assets/lottie/splash/images/img_25.png
  81. BIN
      teacher/src/main/assets/lottie/splash/images/img_26.png
  82. BIN
      teacher/src/main/assets/lottie/splash/images/img_27.png
  83. BIN
      teacher/src/main/assets/lottie/splash/images/img_28.png
  84. BIN
      teacher/src/main/assets/lottie/splash/images/img_29.png
  85. BIN
      teacher/src/main/assets/lottie/splash/images/img_3.png
  86. BIN
      teacher/src/main/assets/lottie/splash/images/img_30.png
  87. BIN
      teacher/src/main/assets/lottie/splash/images/img_31.png
  88. BIN
      teacher/src/main/assets/lottie/splash/images/img_4.png
  89. BIN
      teacher/src/main/assets/lottie/splash/images/img_5.png
  90. BIN
      teacher/src/main/assets/lottie/splash/images/img_6.png
  91. BIN
      teacher/src/main/assets/lottie/splash/images/img_7.png
  92. BIN
      teacher/src/main/assets/lottie/splash/images/img_8.png
  93. BIN
      teacher/src/main/assets/lottie/splash/images/img_9.png
  94. 18 5
      teacher/src/main/java/com/cooleshow/teacher/ui/splash/SplashActivity.kt
  95. 5 6
      teacher/src/main/res/drawable/bg_splash.xml
  96. 12 2
      teacher/src/main/res/layout/activity_splash_layout.xml
  97. 0 0
      teacher/src/main/res/raw/splash_anim.json

+ 1 - 0
BaseLibrary/build.gradle

@@ -188,6 +188,7 @@ dependencies {
         exclude(group: ' org.greenrobot', module: 'eventbus')
     }
     api "com.github.Jay-Goo:RangeSeekBar:v3.0.0"
+    implementation 'com.airbnb.android:lottie:5.0.3'
     //UI适配
 //    api 'me.jessyan:autosize:1.2.1'
 }

BIN
student/src/main/assets/lottie/splash/images/img_0.png


BIN
student/src/main/assets/lottie/splash/images/img_1.png


BIN
student/src/main/assets/lottie/splash/images/img_10.png


BIN
student/src/main/assets/lottie/splash/images/img_11.png


BIN
student/src/main/assets/lottie/splash/images/img_12.png


BIN
student/src/main/assets/lottie/splash/images/img_13.png


BIN
student/src/main/assets/lottie/splash/images/img_14.png


BIN
student/src/main/assets/lottie/splash/images/img_15.png


BIN
student/src/main/assets/lottie/splash/images/img_16.png


BIN
student/src/main/assets/lottie/splash/images/img_17.png


BIN
student/src/main/assets/lottie/splash/images/img_18.png


BIN
student/src/main/assets/lottie/splash/images/img_19.png


BIN
student/src/main/assets/lottie/splash/images/img_2.png


BIN
student/src/main/assets/lottie/splash/images/img_20.png


BIN
student/src/main/assets/lottie/splash/images/img_21.png


BIN
student/src/main/assets/lottie/splash/images/img_22.png


BIN
student/src/main/assets/lottie/splash/images/img_23.png


BIN
student/src/main/assets/lottie/splash/images/img_24.png


BIN
student/src/main/assets/lottie/splash/images/img_25.png


BIN
student/src/main/assets/lottie/splash/images/img_26.png


BIN
student/src/main/assets/lottie/splash/images/img_27.png


BIN
student/src/main/assets/lottie/splash/images/img_28.png


BIN
student/src/main/assets/lottie/splash/images/img_29.png


BIN
student/src/main/assets/lottie/splash/images/img_3.png


BIN
student/src/main/assets/lottie/splash/images/img_30.png


BIN
student/src/main/assets/lottie/splash/images/img_31.png


BIN
student/src/main/assets/lottie/splash/images/img_32.png


BIN
student/src/main/assets/lottie/splash/images/img_33.png


BIN
student/src/main/assets/lottie/splash/images/img_34.png


BIN
student/src/main/assets/lottie/splash/images/img_35.png


BIN
student/src/main/assets/lottie/splash/images/img_36.png


BIN
student/src/main/assets/lottie/splash/images/img_37.png


BIN
student/src/main/assets/lottie/splash/images/img_38.png


BIN
student/src/main/assets/lottie/splash/images/img_39.png


BIN
student/src/main/assets/lottie/splash/images/img_4.png


BIN
student/src/main/assets/lottie/splash/images/img_40.png


BIN
student/src/main/assets/lottie/splash/images/img_41.png


BIN
student/src/main/assets/lottie/splash/images/img_42.png


BIN
student/src/main/assets/lottie/splash/images/img_43.png


BIN
student/src/main/assets/lottie/splash/images/img_44.png


BIN
student/src/main/assets/lottie/splash/images/img_45.png


BIN
student/src/main/assets/lottie/splash/images/img_46.png


BIN
student/src/main/assets/lottie/splash/images/img_47.png


BIN
student/src/main/assets/lottie/splash/images/img_48.png


BIN
student/src/main/assets/lottie/splash/images/img_49.png


BIN
student/src/main/assets/lottie/splash/images/img_5.png


BIN
student/src/main/assets/lottie/splash/images/img_50.png


BIN
student/src/main/assets/lottie/splash/images/img_51.png


BIN
student/src/main/assets/lottie/splash/images/img_52.png


BIN
student/src/main/assets/lottie/splash/images/img_53.png


BIN
student/src/main/assets/lottie/splash/images/img_54.png


BIN
student/src/main/assets/lottie/splash/images/img_55.png


BIN
student/src/main/assets/lottie/splash/images/img_6.png


BIN
student/src/main/assets/lottie/splash/images/img_7.png


BIN
student/src/main/assets/lottie/splash/images/img_8.png


BIN
student/src/main/assets/lottie/splash/images/img_9.png


+ 19 - 0
student/src/main/java/com/cooleshow/student/ui/splash/SplashActivity.kt

@@ -1,5 +1,6 @@
 package com.cooleshow.student.ui.splash
 
+import android.animation.Animator
 import android.net.Uri
 import android.os.Bundle
 import android.text.Spannable
@@ -41,10 +42,28 @@ class SplashActivity : BaseActivity<ActivitySplashLayoutBinding>() {
     }
 
     override fun initView() {
+        viewBinding.viewAnim.playAnimation()
+        viewBinding.viewAnim.addAnimatorListener(object : Animator.AnimatorListener {
+            override fun onAnimationStart(animation: Animator) {}
+            override fun onAnimationEnd(animation: Animator) {
+                checkPrivacyMode();
+            }
+
+            override fun onAnimationCancel(animation: Animator) {
+                checkPrivacyMode()
+            }
+
+            override fun onAnimationRepeat(animation: Animator) {
+
+            }
+        })
     }
 
     override fun initData() {
         super.initData()
+    }
+
+    private fun checkPrivacyMode(){
         var privacyMode = UserHelper.getAppPrivacyMode()
         if (privacyMode == 0) {
             //显示隐私协议提示弹窗

+ 5 - 6
student/src/main/res/drawable/bg_splash.xml

@@ -9,16 +9,15 @@
         </shape>
     </item>
 
-    <item android:gravity="bottom"
-        android:bottom="@dimen/dp_179">
+<!--    <item android:gravity="bottom"-->
+<!--        android:bottom="@dimen/dp_179">-->
 
-        <bitmap android:src="@drawable/bg_icon_splash" />
-    </item>
+<!--        <bitmap android:src="@drawable/bg_icon_splash" />-->
+<!--    </item>-->
     <item
         android:width="@dimen/dp_115"
         android:height="@dimen/dp_34"
-        android:bottom="@dimen/dp_100"
-        android:gravity="bottom|center_horizontal">
+        android:gravity="center">
         <bitmap android:src="@drawable/icon_splash_logo" />
     </item>
 

+ 12 - 2
student/src/main/res/layout/activity_splash_layout.xml

@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white">
 
 
     <ImageView
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:background="@drawable/bg_splash" />
 
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/view_anim"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:lottie_autoPlay="true"
+        app:lottie_imageAssetsFolder="lottie/splash/images/"
+        app:lottie_loop="false"
+        app:lottie_rawRes="@raw/splash_anim" />
 
-</RelativeLayout>
+</FrameLayout>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
student/src/main/res/raw/splash_anim.json


BIN
teacher/src/main/assets/lottie/splash/images/img_0.png


BIN
teacher/src/main/assets/lottie/splash/images/img_1.png


BIN
teacher/src/main/assets/lottie/splash/images/img_10.png


BIN
teacher/src/main/assets/lottie/splash/images/img_11.png


BIN
teacher/src/main/assets/lottie/splash/images/img_12.png


BIN
teacher/src/main/assets/lottie/splash/images/img_13.png


BIN
teacher/src/main/assets/lottie/splash/images/img_14.png


BIN
teacher/src/main/assets/lottie/splash/images/img_15.png


BIN
teacher/src/main/assets/lottie/splash/images/img_16.png


BIN
teacher/src/main/assets/lottie/splash/images/img_17.png


BIN
teacher/src/main/assets/lottie/splash/images/img_18.png


BIN
teacher/src/main/assets/lottie/splash/images/img_19.png


BIN
teacher/src/main/assets/lottie/splash/images/img_2.png


BIN
teacher/src/main/assets/lottie/splash/images/img_20.png


BIN
teacher/src/main/assets/lottie/splash/images/img_21.png


BIN
teacher/src/main/assets/lottie/splash/images/img_22.png


BIN
teacher/src/main/assets/lottie/splash/images/img_23.png


BIN
teacher/src/main/assets/lottie/splash/images/img_24.png


BIN
teacher/src/main/assets/lottie/splash/images/img_25.png


BIN
teacher/src/main/assets/lottie/splash/images/img_26.png


BIN
teacher/src/main/assets/lottie/splash/images/img_27.png


BIN
teacher/src/main/assets/lottie/splash/images/img_28.png


BIN
teacher/src/main/assets/lottie/splash/images/img_29.png


BIN
teacher/src/main/assets/lottie/splash/images/img_3.png


BIN
teacher/src/main/assets/lottie/splash/images/img_30.png


BIN
teacher/src/main/assets/lottie/splash/images/img_31.png


BIN
teacher/src/main/assets/lottie/splash/images/img_4.png


BIN
teacher/src/main/assets/lottie/splash/images/img_5.png


BIN
teacher/src/main/assets/lottie/splash/images/img_6.png


BIN
teacher/src/main/assets/lottie/splash/images/img_7.png


BIN
teacher/src/main/assets/lottie/splash/images/img_8.png


BIN
teacher/src/main/assets/lottie/splash/images/img_9.png


+ 18 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/splash/SplashActivity.kt

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.ui.splash
 
+import android.animation.Animator
 import android.net.Uri
 import android.text.Spannable
 import android.text.SpannableStringBuilder
@@ -7,12 +8,8 @@ import android.text.TextPaint
 import android.text.TextUtils
 import android.text.style.ClickableSpan
 import android.view.View
-import cn.jiguang.api.utils.JCollectionAuth
-import cn.jpush.android.api.JPushInterface
 import com.alibaba.android.arouter.facade.Postcard
 import com.alibaba.android.arouter.launcher.ARouter
-import com.cooleshow.base.bean.RouteBean
-import com.cooleshow.base.common.BaseApplication
 import com.cooleshow.base.common.ConstantKey
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.constanst.Constants
@@ -25,7 +22,6 @@ import com.cooleshow.teacher.helper.InitHelper
 import com.cooleshow.usercenter.constants.UserConstants
 import com.cooleshow.usercenter.helper.UserHelper
 import com.cooleshow.usercenter.ui.activity.VerifyCodeLoginActivity
-import com.umeng.commonsdk.UMConfigure
 import java.net.URLDecoder
 
 
@@ -38,11 +34,28 @@ class SplashActivity : BaseActivity<ActivitySplashLayoutBinding>() {
     }
 
     override fun initView() {
+        viewBinding.viewAnim.playAnimation()
+        viewBinding.viewAnim.addAnimatorListener(object : Animator.AnimatorListener {
+            override fun onAnimationStart(animation: Animator) {}
+            override fun onAnimationEnd(animation: Animator) {
+                checkPrivacyMode();
+            }
+
+            override fun onAnimationCancel(animation: Animator) {
+                checkPrivacyMode()
+            }
+
+            override fun onAnimationRepeat(animation: Animator) {
 
+            }
+        })
     }
 
     override fun initData() {
         super.initData()
+    }
+
+    private fun checkPrivacyMode() {
         var privacyMode = UserHelper.getAppPrivacyMode()
         if (privacyMode == 0) {
             //显示隐私协议提示弹窗

+ 5 - 6
teacher/src/main/res/drawable/bg_splash.xml

@@ -9,16 +9,15 @@
         </shape>
     </item>
 
-    <item android:gravity="bottom"
-        android:bottom="@dimen/dp_179">
+<!--    <item android:gravity="bottom"-->
+<!--        android:bottom="@dimen/dp_179">-->
 
-        <bitmap android:src="@drawable/bg_icon_splash" />
-    </item>
+<!--        <bitmap android:src="@drawable/bg_icon_splash" />-->
+<!--    </item>-->
     <item
         android:width="@dimen/dp_115"
         android:height="@dimen/dp_34"
-        android:bottom="@dimen/dp_100"
-        android:gravity="bottom|center_horizontal">
+        android:gravity="center">
         <bitmap android:src="@drawable/icon_splash_logo" />
     </item>
 

+ 12 - 2
teacher/src/main/res/layout/activity_splash_layout.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:background="@color/white">
 
     <FrameLayout
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:orientation="vertical">
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
 
 
         <ImageView
@@ -18,4 +20,12 @@
             android:background="@drawable/bg_splash" />
     </FrameLayout>
 
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/view_anim"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:lottie_autoPlay="true"
+        app:lottie_imageAssetsFolder="lottie/splash/images/"
+        app:lottie_loop="false"
+        app:lottie_rawRes="@raw/splash_anim" />
 </FrameLayout>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
teacher/src/main/res/raw/splash_anim.json


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott