ソースを参照

修复首页悬浮窗问题

Pq 2 年 前
コミット
04bbba1eff

+ 15 - 8
student/src/main/res/layout/activity_main.xml

@@ -240,13 +240,20 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.cooleshow.base.widgets.CustomDragView
-        android:id="@+id/view_suspension"
-        android:visibility="gone"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
+    <FrameLayout
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
-        app:layout_constraintRight_toRightOf="parent"/>
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <com.cooleshow.base.widgets.CustomDragView
+            android:layout_gravity="bottom|right"
+            android:id="@+id/view_suspension"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="12dp"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="parent" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 25 - 19
teacher/src/main/res/layout/activity_main.xml

@@ -41,11 +41,11 @@
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.cooleshow.base.widgets.TabAnimationView
-            android:layout_marginTop="10dp"
             android:id="@+id/tab_home"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="27dp"
+            android:layout_marginTop="10dp"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/tab_course"
@@ -77,22 +77,21 @@
             app:lottie_rawRes="@raw/liaotian" />
 
         <com.cooleshow.base.widgets.UnreadCountTextView
-            app:layout_constraintCircleAngle="45"
-            app:layout_constraintCircleRadius="12dp"
-            app:layout_constraintCircle="@+id/tab_chat"
-            android:includeFontPadding="false"
             android:id="@+id/tv_msg_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
+            android:includeFontPadding="false"
             android:paddingStart="@dimen/dp_4"
             android:paddingEnd="@dimen/dp_4"
             android:text=""
             android:textColor="@color/white"
             android:textSize="@dimen/sp_12"
             android:visibility="gone"
-            />
+            app:layout_constraintCircle="@+id/tab_chat"
+            app:layout_constraintCircleAngle="45"
+            app:layout_constraintCircleRadius="12dp" />
 
         <com.cooleshow.base.widgets.TabAnimationView
             android:id="@+id/tab_mall"
@@ -190,50 +189,50 @@
             app:layout_constraintTop_toTopOf="@+id/tv_home" />
 
         <View
-            android:onClick="onTabClick"
             android:id="@+id/view_home"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/view_course"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:onClick="onTabClick"
             android:id="@+id/view_course"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/view_home"
             app:layout_constraintRight_toLeftOf="@+id/view_chat"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:onClick="onTabClick"
             android:id="@+id/view_chat"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/view_course"
             app:layout_constraintRight_toLeftOf="@+id/view_mall"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:onClick="onTabClick"
             android:id="@+id/view_mall"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/view_chat"
             app:layout_constraintRight_toLeftOf="@+id/view_mine"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:onClick="onTabClick"
             android:id="@+id/view_mine"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/view_mall"
             app:layout_constraintRight_toRightOf="parent"
@@ -241,13 +240,20 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.cooleshow.base.widgets.CustomDragView
-        android:id="@+id/view_suspension"
-        android:visibility="gone"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
+    <FrameLayout
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
-        app:layout_constraintRight_toRightOf="parent"/>
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <com.cooleshow.base.widgets.CustomDragView
+            android:layout_gravity="bottom|right"
+            android:id="@+id/view_suspension"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="12dp"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="parent" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>