浏览代码

修改首页适配问题

Pq 1 年之前
父节点
当前提交
66f421e480

文件差异内容过多而无法显示
+ 0 - 0
institution/src/main/assets/lottieHome/home_cover.json


+ 2 - 1
institution/src/main/java/com/cooleshow/institution/stu/ui/main/CardAnimFragment.java

@@ -64,6 +64,7 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
 
 
     private void loadAnim() {
+        mViewBinding.viewUnlockAnim.setAnimation("lottieHome/home_cover.json");
         String assetName = "lottieHome/empty_anim.json";
         if (pageType == HomePageType.SUBJECT_PRACTICE.getValue()) {
             assetName = "lottieHome/subject_practice.json";
@@ -108,7 +109,7 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
     }
 
     private void initListener() {
-        mViewBinding.viewUnlock.setOnClickListener(new View.OnClickListener() {
+        mViewBinding.viewUnlockAnim.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 JGWebStartHelper.startTrainTools();

+ 31 - 30
institution/src/main/res/layout/fg_card_anim_layout.xml

@@ -26,47 +26,48 @@
         app:layout_constraintRight_toRightOf="@+id/view_live_anim"
         app:layout_constraintTop_toTopOf="@+id/view_live_anim" />
 
-    <View
-        android:id="@+id/view_unlock"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shape_66000000_12dp"
-        app:layout_constraintDimensionRatio="h,888:1712"
+    <com.airbnb.lottie.LottieAnimationView
+        android:visibility="gone"
+        android:id="@+id/view_unlock_anim"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:lottie_autoPlay="false"
+        app:lottie_loop="false"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/iv_lock"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/jg_icon_lock"
-        app:layout_constraintBottom_toTopOf="@+id/tv_lock_tip"
-        app:layout_constraintLeft_toLeftOf="@+id/view_unlock"
-        app:layout_constraintRight_toRightOf="@+id/view_unlock"
-        app:layout_constraintTop_toTopOf="@+id/view_unlock"
-        app:layout_constraintVertical_chainStyle="packed" />
+<!--    <ImageView-->
+<!--        android:id="@+id/iv_lock"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:src="@drawable/jg_icon_lock"-->
+<!--        app:layout_constraintBottom_toTopOf="@+id/tv_lock_tip"-->
+<!--        app:layout_constraintLeft_toLeftOf="@+id/view_unlock"-->
+<!--        app:layout_constraintRight_toRightOf="@+id/view_unlock"-->
+<!--        app:layout_constraintTop_toTopOf="@+id/view_unlock"-->
+<!--        app:layout_constraintVertical_chainStyle="packed" />-->
 
-    <TextView
-        android:id="@+id/tv_lock_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="暂未解锁"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_16"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/view_unlock"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_lock"
-        app:layout_constraintRight_toRightOf="@+id/iv_lock"
-        app:layout_constraintTop_toBottomOf="@+id/iv_lock" />
+<!--    <TextView-->
+<!--        android:id="@+id/tv_lock_tip"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="8dp"-->
+<!--        android:text="暂未解锁"-->
+<!--        android:textColor="@color/white"-->
+<!--        android:textSize="@dimen/sp_16"-->
+<!--        android:textStyle="bold"-->
+<!--        app:layout_constraintBottom_toBottomOf="@+id/view_unlock"-->
+<!--        app:layout_constraintLeft_toLeftOf="@+id/iv_lock"-->
+<!--        app:layout_constraintRight_toRightOf="@+id/iv_lock"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/iv_lock" />-->
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_unlock"
         android:visibility="gone"
         tools:visibility="visible"
-        app:constraint_referenced_ids="iv_lock,tv_lock_tip,view_unlock"
+        app:constraint_referenced_ids="view_unlock_anim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 2 - 0
institution/src/main/res/layout/fg_home_card_layout.xml

@@ -95,6 +95,8 @@
         android:layout_height="0dp"
         app:layout_constraintWidth_percent="0.79"
         android:clipChildren="false"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

部分文件因为文件数量过多而无法显示