修改title

app/src/main/AndroidManifest.xml

@@ -36,16 +36,16 @@
         <activity
             android:name=".ui.login.LoginActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
 
         <activity
             android:name=".ui.exception.ErrorDialogActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
         <activity
             android:name=".ui.exception.ServerErrActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
         <activity
             android:name=".ui.payment.PaymentActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
@@ -59,11 +59,11 @@
             android:name=".ui.marketing.ticket.ReturnTicketActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_ticket"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/AppTheme"/>
         <activity
-        android:name=".ui.settle.SettleActivity"
-        android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-        android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:name=".ui.settle.SettleActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/res/layout/activity_integral.xml

@@ -18,15 +18,7 @@
 
         <include
             android:id="@+id/ic_title"
-            layout="@layout/title"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/singleline_white_gray"
-            app:layout_constraintBottom_toTopOf="@id/btn_add"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_weight="@integer/all_top_weight"/>
+            layout="@layout/title"/>
 
         <LinearLayout
             android:id="@+id/btn_add"
@@ -66,8 +58,6 @@
             android:background="@color/white"
             android:gravity="center"
             android:orientation="horizontal"
-            android:paddingLeft="@dimen/all_margin"
-            android:paddingRight="@dimen/all_margin"
             app:layout_constraintBottom_toBottomOf="@id/cl_bottom"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -83,32 +73,31 @@
 
                 <RadioButton
                     android:id="@+id/rb_get"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/all_margin"
-                    android:layout_marginRight="@dimen/all_margin"
+                    android:layout_marginLeft="@dimen/all_padding"
+                    android:layout_marginRight="@dimen/all_padding"
+                    android:layout_weight="1"
                     android:background="@drawable/radio_select"
                     android:button="@null"
+                    android:gravity="center"
                     android:onClick="@{OnClickListener}"
                     android:padding="@dimen/all_padding"
                     android:text="获取规则"
                     android:textColor="@drawable/radio_select"
                     android:textSize="@dimen/et_textsize"/>
 
-                <View
-                    android:layout_width="@dimen/all_line_width"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/all_margin"
-                    android:background="@color/gary"></View>
 
                 <RadioButton
                     android:id="@+id/rb_exchange"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/all_margin"
-                    android:layout_marginRight="@dimen/all_margin"
+                    android:layout_marginLeft="@dimen/all_padding"
+                    android:layout_marginRight="@dimen/all_padding"
+                    android:layout_weight="1"
                     android:background="@drawable/radio_select"
                     android:button="@null"
+                    android:gravity="center"
                     android:onClick="@{OnClickListener}"
                     android:padding="@dimen/all_padding"
                     android:text="兑换规则"