diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index adae491..f35f227 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
index 58a6093..3d8bd99 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
@@ -3,6 +3,7 @@ package com.shunzhi.parent.ui.fragment.apply;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -22,6 +23,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements V
     private Button bt_cancel;
     ReplaceCardDialog replaceCardDialog=null;
     private EditText et_cardnum;
+    private String cardnum;
 
     @NonNull
     @Override
@@ -48,10 +50,15 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements V
     public void onClick(View view) {
         switch (view.getId()){
             case R.id.bt_sure:
-                if (et_cardnum.getText().toString().trim().equals("")||
-                        et_cardnum.getText().toString().trim().equals(null)){
+                cardnum = et_cardnum.getText().toString().trim();
+                if (TextUtils.isEmpty(cardnum)){
                     Toast.makeText(getActivity(),"卡号不能为空，请重新输入",Toast.LENGTH_SHORT).show();
-                }else {
+                }
+//                if (et_cardnum.getText().toString().trim().equals("")||
+//                        et_cardnum.getText().toString().trim().equals(null)){
+//                    Toast.makeText(getActivity(),"卡号不能为空，请重新输入",Toast.LENGTH_SHORT).show();
+//                }
+            else {
                     replaceCardDialog.setTitle("补卡提示");
                     replaceCardDialog.setText("您已补卡成功！");
                     replaceCardDialog.show();
diff --git a/app/src/main/java/com/shunzhi/parent/views/ReplaceCardDialog.java b/app/src/main/java/com/shunzhi/parent/views/ReplaceCardDialog.java
index e257dd5..5787d48 100644
--- a/app/src/main/java/com/shunzhi/parent/views/ReplaceCardDialog.java
+++ b/app/src/main/java/com/shunzhi/parent/views/ReplaceCardDialog.java
@@ -9,7 +9,8 @@ import android.widget.TextView;
 import com.shunzhi.parent.R;
 
 /**
- * Created by Administrator on 2018/4/10 0010.
+ * Created by wwx on 2018/4/10 0010.
+ * 补卡提示界面
  */
 
 public class ReplaceCardDialog extends Dialog implements View.OnClickListener{
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index ea22c27..f56827a 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -1,8 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/bgColor"
     android:orientation="vertical"
     tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
@@ -27,7 +27,6 @@
             android:textSize="@dimen/textSize16" />
 
         <TextView
-            android:visibility="gone"
             android:id="@+id/tvDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -36,42 +35,40 @@
             android:gravity="center_horizontal"
             android:text="报告"
             android:textColor="@color/white"
-            android:textSize="@dimen/textSize18" />
+            android:textSize="@dimen/textSize18"
+            android:visibility="gone" />
 
         <android.support.design.widget.TabLayout
+            android:id="@+id/tabLayout"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
+            app:tabGravity="fill"
             app:tabIndicatorColor="@color/white"
-            app:tabSelectedTextColor="@color/white"
-            app:tabTextColor="@color/textColor"
-            app:tabMaxWidth="@dimen/size_dp_60"
-            android:layout_height="wrap_content"
-            android:id="@+id/tabLayout"
             app:tabIndicatorHeight="@dimen/size_dp_3"
+            app:tabMaxWidth="@dimen/size_dp_60"
             app:tabMode="scrollable"
-            app:tabGravity="fill"
+            app:tabSelectedTextColor="@color/white"
             app:tabTextAppearance="@style/TextView_Wrap_16"
-            ></android.support.design.widget.TabLayout>
+            app:tabTextColor="@color/textColor"></android.support.design.widget.TabLayout>
 
         <TextView
             android:id="@+id/tvShaiXuan"
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:drawableRight="@drawable/screen"
             android:text="筛选"
             android:textColor="@color/white"
-            android:textSize="@dimen/textSize16" />
+            android:textSize="@dimen/textSize16"
+            android:visibility="gone" />
     </FrameLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        android:visibility="visible"
-
-        >
+        android:visibility="visible">
 
         <TextView
             android:id="@+id/tvNoData"
@@ -85,11 +82,10 @@
     </RelativeLayout>
 
     <android.support.v4.view.ViewPager
-        android:visibility="visible"
+        android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/viewPager"
-        ></android.support.v4.view.ViewPager>
+        android:visibility="visible"></android.support.v4.view.ViewPager>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 57ec076..d3e6489 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <color name="hintTextColor">#494947</color>
     <color name="bottomline">#B8B8B9</color>
     <color name="bg_main">#F0EFF5</color>
-
+    <color name="textRed">#FC5B6A</color>
     <color name="back_top">#A6DAFF</color>
     <color name="textBlue">#ACC9FC</color>
     <color name="titleColor">#A6DAFF</color>
@@ -19,8 +19,8 @@
     <color name="huodong_blue">#ACD1FB</color>
     <color name="text_color">#757575</color>
     <color name="textGreen">#5FB762</color>
-    <color name="textRed">#FC5B6A</color>
     <color name="transparent">#00000000</color>
     <color name="deyu_textColor">#60b3f6</color>
     <color name="deyu_BlueColor">#2b71c4</color>
+    <color name="line_color">#80bebebe</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 43a4397..7ab3c72 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,6 +27,14 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     </style>
 
+    <style name="DialogTips" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:gravity">center</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+    </style>
+
     <style name="TextView_Wrap_16">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
--
libgit2 0.21.0