Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     //解决问题的代码
     dexOptions {
@@ -80,6 +81,5 @@ dependencies {
     compile 'com.github.ybq:Android-SpinKit:1.1.0'
     compile 'com.youth.banner:banner:1.4.10'
     compile 'cn.jzvd:jiaozivideoplayer:6.0.0'
-    compile 'com.liulishuo.filedownloader:library:1.6.8'
     compile(name: 'zx_print_library-debug', ext: 'aar')
 }

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

@@ -32,22 +32,10 @@
             android:id="@+id/ic_title"
             layout="@layout/title"/>
 
-        <Button
-            android:id="@+id/btn_add"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_margin="@dimen/all_margin"
-            android:background="@color/red_guanyu"
-            android:onClick="@{OnClickListener}"
-            android:text="确定"
-            android:textColor="@color/white"
-            android:textSize="@dimen/et_textsize"/>
 
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/btn_add"
             android:layout_below="@+id/ic_title">
 
             <LinearLayout
@@ -680,8 +668,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="@dimen/all_padding_left_right"
-                        android:gravity="right"
                         android:layout_weight="2"
+                        android:gravity="right"
                         android:text="个月"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
@@ -692,6 +680,23 @@
                     android:layout_height="@dimen/all_line_width"
                     android:background="@color/gray1"></View>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:id="@+id/btn_add"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/all_margin"
+                        android:background="@color/red_guanyu"
+                        android:onClick="@{OnClickListener}"
+                        android:text="确定"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/et_textsize"/>
+                </LinearLayout>
+
             </LinearLayout>
         </ScrollView>
 

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

@@ -28,7 +28,7 @@
                 android:layout_weight="2.3">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@mipmap/return_ticket_one"/>
 
@@ -97,7 +97,7 @@
                 android:layout_weight="1">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@mipmap/return_ticket_two"
                     />