Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardDetailsFragment.java

@@ -436,26 +436,31 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             Toast.makeText(activity,"请选择证件有效期",Toast.LENGTH_SHORT).show();
             return;
         }
-        if(TextUtils.isEmpty(etCarNo.getText().toString())){
-            Toast.makeText(activity,"请填写车牌号码",Toast.LENGTH_SHORT).show();
-            return;
-        }
 
-        if(TextUtils.isEmpty(etHomePhone.getText().toString()) || TextUtils.isEmpty(etHomeQ.getText().toString())){
-            Toast.makeText(activity,"请填写住宅电话",Toast.LENGTH_SHORT).show();
-            return;
-        }
+
 
 //        if(!RegexUtils.isTel(etHomePhone.getText().toString() +"- "+ etHomeQ.getText().toString())){
 //            Toast.makeText(activity,"住宅电话格式不正确",Toast.LENGTH_SHORT).show();
 //            return;
 //        }
 
-        if(TextUtils.isEmpty(etQQ.getText().toString())){
-            Toast.makeText(activity,"请填写常用QQ号码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
+        //不是必填的
+//        if(TextUtils.isEmpty(etQQ.getText().toString())){
+//            Toast.makeText(activity,"请填写常用QQ号码",Toast.LENGTH_SHORT).show();
+//            return;
+//        }
+//
+//        //不是必填
+//        if(TextUtils.isEmpty(etCarNo.getText().toString())){
+//            Toast.makeText(activity,"请填写车牌号码",Toast.LENGTH_SHORT).show();
+//            return;
+//        }
+//
+//        //不是必填的
+//        if(TextUtils.isEmpty(etHomePhone.getText().toString()) || TextUtils.isEmpty(etHomeQ.getText().toString())){
+//            Toast.makeText(activity,"请填写住宅电话",Toast.LENGTH_SHORT).show();
+//            return;
+//        }
         CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
 
         Map<String,String> map = new HashMap<>();
@@ -533,20 +538,33 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         }
 
         String o_p_number = etCarNo.getText().toString();
-        map.put("o_p_number",o_p_number);
-        manager.o_p_number = o_p_number;
+        if(!TextUtils.isEmpty(o_p_number)){
+            map.put("o_p_number",o_p_number);
+            manager.o_p_number = o_p_number;
+        }
+
+
 
         String o_tel_1 = etHomeQ.getText().toString();
-        map.put("o_tel_1",o_tel_1);
-        manager.o_tel_1 = o_tel_1;
+        if(!TextUtils.isEmpty(o_tel_1)){
+            map.put("o_tel_1",o_tel_1);
+            manager.o_tel_1 = o_tel_1;
+        }
+
 
         String o_tel_2 = etHomePhone.getText().toString();
-        map.put("o_tel_2",o_tel_2);
-        manager.o_tel_2 = o_tel_2;
+        if(!TextUtils.isEmpty(o_tel_2)){
+            map.put("o_tel_2",o_tel_2);
+            manager.o_tel_2 = o_tel_2;
+        }
+
 
         String o_qq = etQQ.getText().toString();
-        map.put("o_qq",o_qq);
-        manager.o_qq = o_qq;
+        if(!TextUtils.isEmpty(o_qq)){
+            map.put("o_qq",o_qq);
+            manager.o_qq = o_qq;
+        }
+
 
         boolean isAgree = CreditCardInfosManager.getInstance().is_agree;
         map.put("is_agree",isAgree ? "1" : "0");
@@ -557,6 +575,7 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 //        map.put("w_tel_3","876");
 //        map.put("o_tel_3","522");
 
+        //判断下没有用日历选择有效期，然后直接选择长期有效，会提示没有填有效期。
         presenter.commitDetails(map);
     }
 

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

@@ -12,6 +12,7 @@
 
         <ImageView
             android:id="@+id/iv_pre"
+            android:padding="5dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -27,6 +28,7 @@
 
         <ImageView
             android:id="@+id/iv_next"
+            android:padding="5dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"

kfzslibrary/src/main/java/com/kfzs/libs/di/http/HttpModule.java

@@ -20,8 +20,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
 @Module
 public class HttpModule {
 
-//    public static final String BASE_URL = "http://10.8.240.165:7011/";
-    public static final String BASE_URL = "http://10.8.230.17:7011/";
+    public static final String BASE_URL = "http://10.8.240.165:7011/";
+//    public static final String BASE_URL = "http://10.8.230.17:7011/";
 
     public static final int CONNECT_TIMEOUT = 15;
     public static final int READ_TIMEOUT = 15;