Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/baianxi_android into master

BaiAnXi/app/src/main/res/layout/layout_task_law.xml

@@ -32,15 +32,14 @@
 
         <TextView
             android:id="@+id/tv_task_detail_risk_info"
-            style="@style/text_style"
-            android:layout_width="wrap_content"
+            style="@style/content_style"
             android:layout_marginStart="16dp"
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toRightOf="@+id/tv_task_detail_risk"
+            app:layout_constraintRight_toRightOf="@+id/view_task_detail_law_text"
             app:layout_constraintTop_toTopOf="@+id/tv_task_detail_risk" />
 
-
         <TextView
             android:id="@+id/tv_task_detail_result"
             style="@style/text_style"
@@ -50,16 +49,16 @@
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toLeftOf="@+id/view_task_detail_law_text"
-            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_risk" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_risk_info" />
 
         <TextView
             android:id="@+id/tv_task_detail_result_info"
-            style="@style/text_style"
-            android:layout_width="wrap_content"
+            style="@style/content_style"
             android:layout_marginStart="16dp"
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toRightOf="@+id/tv_task_detail_result"
+            app:layout_constraintRight_toRightOf="@+id/tv_task_detail_risk_info"
             app:layout_constraintTop_toTopOf="@+id/tv_task_detail_result" />
 
         <TextView
@@ -71,12 +70,11 @@
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toLeftOf="@+id/view_task_detail_law_text"
-            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_result" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_result_info" />
 
         <TextView
             android:id="@+id/tv_task_detail_law_info"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/content_style"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="12dp"
             android:textColor="@color/bg_white"
@@ -98,12 +96,12 @@
 
         <TextView
             android:id="@+id/tv_task_detail_leve_info"
-            style="@style/text_style"
-            android:layout_width="wrap_content"
+            style="@style/content_style"
             android:layout_marginStart="16dp"
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toRightOf="@+id/tv_task_detail_level"
+            app:layout_constraintRight_toRightOf="@+id/view_task_detail_law_text"
             app:layout_constraintTop_toTopOf="@+id/tv_task_detail_level" />
 
         <TextView
@@ -115,16 +113,13 @@
             android:textColor="@color/bg_white"
             android:textSize="14sp"
             app:layout_constraintLeft_toLeftOf="@+id/view_task_detail_law_text"
-            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_level" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_task_detail_leve_info" />
 
         <TextView
             android:id="@+id/tv_task_detail_ctl_info"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/content_style"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="12dp"
             android:textColor="@color/bg_white"
-            android:text="地方大师傅士大夫大师傅地方就是砥砺奋进零点十分激烈的浪费大家十六分零四的发来的数据雷锋精神的浪费粮食的法律手段解放了劳动纠纷老师地方，里的飞机螺丝钉解放。"
             android:textSize="14sp"
             app:layout_constraintLeft_toRightOf="@+id/tv_task_detail_ctl"
             app:layout_constraintRight_toRightOf="@+id/view_task_detail_law_text"

BaiAnXi/app/src/main/res/values/styles.xml

@@ -22,6 +22,14 @@
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="content_style">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/text_color_default</item>
+        <item name="android:gravity">center|start</item>
+    </style>
+
     <style name="edit_style">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>