From 73eb2f6ecbf37bf590d8992c27ad8bbe4e15827d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 27 Aug 2020 23:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=A0=87=E7=AD=BEUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/upload/view/UploadVideoActivity.kt  |  3 +-
 .../main/res/layout/activity_video_uplaod.xml | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
index 7a64f5a738..cea5857c18 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
@@ -118,6 +118,7 @@ class UploadVideoActivity : ToolBarActivity() {
                 mActivityLabelEntity = data.getParcelableExtra(ActivityLabelEntity::class.java.simpleName)
                 mBinding.activityContainer.visibility = View.VISIBLE
                 mBinding.activityTv.text = mActivityLabelEntity?.name
+                mBinding.activityTv.requestLayout()
                 checkPostButtonStatus()
             }
         }
@@ -173,8 +174,8 @@ class UploadVideoActivity : ToolBarActivity() {
         }
         mBinding.deleteActivity.setOnClickListener {
             mActivityLabelEntity = null
-            mBinding.activityContainer.visibility = View.GONE
             mBinding.activityTv.text = ""
+            mBinding.activityContainer.visibility = View.GONE
             checkPostButtonStatus()
         }
         mBinding.watermarkSb.setOnCheckedChangeListener { _, isChecked ->
diff --git a/app/src/main/res/layout/activity_video_uplaod.xml b/app/src/main/res/layout/activity_video_uplaod.xml
index d5227563e4..33880f44fb 100644
--- a/app/src/main/res/layout/activity_video_uplaod.xml
+++ b/app/src/main/res/layout/activity_video_uplaod.xml
@@ -274,19 +274,16 @@
 
                 </com.google.android.flexbox.FlexboxLayout>
 
-                <com.google.android.flexbox.FlexboxLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/activityFlexbox"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:paddingBottom="16dp"
-                    app:dividerDrawable="@drawable/shape_flexbox_divider"
-                    app:flexDirection="row"
-                    app:flexWrap="wrap"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/game_tag"
                     app:layout_constraintTop_toBottomOf="@+id/game_tag"
-                    app:showDivider="middle"
                     android:visibility="gone"
+                    android:layout_marginRight="20dp"
                     tools:visibility="visible">
 
                     <ImageView
@@ -296,7 +293,9 @@
                         android:background="@drawable/bg_upload_video_choose_activity_enable"
                         android:paddingLeft="12dp"
                         android:paddingRight="12dp"
-                        android:src="@drawable/ic_upload_video_activity_enable" />
+                        android:src="@drawable/ic_upload_video_activity_enable"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"/>
 
                     <LinearLayout
                         android:id="@+id/activityContainer"
@@ -307,29 +306,38 @@
                         android:orientation="horizontal"
                         android:paddingLeft="12dp"
                         android:paddingRight="8dp"
+                        android:layout_marginLeft="8dp"
                         android:visibility="gone"
-                        tools:visibility="visible">
+                        tools:visibility="visible"
+                        app:layout_constrainedWidth="true"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/chooseActivityIv"
+                        app:layout_constraintEnd_toEndOf="parent">
 
                         <TextView
                             android:id="@+id/activityTv"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="28dp"
+                            android:layout_weight="1"
                             android:drawableLeft="@drawable/ic_activity"
                             android:drawablePadding="4dp"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:textColor="@color/white"
                             android:textSize="12sp"
-                            tools:text="光遇-原创视频征集" />
+                            android:maxLines="1"
+                            android:ellipsize="end"
+                            tools:text="光遇" />
 
                         <ImageView
                             android:id="@+id/deleteActivity"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="4dp"
+                            android:layout_marginLeft="8dp"
                             android:src="@drawable/ic_activity_delete" />
                     </LinearLayout>
-                </com.google.android.flexbox.FlexboxLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
                     android:id="@+id/game_tag_line"