修改信用卡模块测试bug，非必填选项做出提示，修改填入数据判断错误逻辑

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,6 +66,8 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
     CheckBox cbxMarryYes;
     @BindView(R.id.cbx_marry_no)
     CheckBox cbxMarryNo;
+    @BindView(R.id.cbx_expire_long)
+    CheckBox cbxExpireLong;
 
 
     private Unbinder unbinder;
@@ -109,30 +112,46 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
     @Override
     public void setupViews(@Nullable Bundle savedInstanceState) {
 
+        CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
         //身份证日期
-        editCardTime.setText(CreditCardInfosManager.getInstance().o_id_expire);
+        if(TextUtils.equals(manager.o_id_expire,CreditCardInfosManager.EXPIRE_LONG)){
+            cbxExpireLong.setChecked(true);
+            editCardTime.setVisibility(View.GONE);
+        }
+        else {
+            cbxExpireLong.setChecked(false);
+            editCardTime.setVisibility(View.VISIBLE);
+            editCardTime.setText(CreditCardInfosManager.getInstance().o_id_expire);
+        }
 
         editAddressOrigin.setText(CreditCardInfosManager.getInstance().p_city);
         editAddressNow.setText(CreditCardInfosManager.getInstance().p_address);
         editEmail.setText(CreditCardInfosManager.getInstance().p_email);
         //婚姻
-        cbxMarryYes.setChecked(false);
-        cbxMarryNo.setChecked(false);
         String marray = CreditCardInfosManager.getInstance().p_marray;
-        /// ? 需确认此处
-        if(marray.equalsIgnoreCase("Y")){
+        if(TextUtils.equals(CreditCardInfosManager.MARRY_Y,marray)){
             cbxMarryYes.setChecked(true);
-        }else if(marray.equalsIgnoreCase("N")){
+            cbxMarryNo.setChecked(false);
+        }
+        else {
+            cbxMarryYes.setChecked(false);
             cbxMarryNo.setChecked(true);
         }
 
+
         //教育
         editEduInfo.setText(CreditCardInfosManager.getInstance().p_edu);
         //公司信息
         editCompanyName.setText(CreditCardInfosManager.getInstance().w_name);
         editCompanyCity.setText(CreditCardInfosManager.getInstance().w_city);
         editCompanyAddress.setText(CreditCardInfosManager.getInstance().w_address);
-        editCompanyTel.setText(CreditCardInfosManager.getInstance().w_tel_1 +"-"+CreditCardInfosManager.getInstance().w_tel_2);
+        //单位电话
+        String companyTel = CreditCardInfosManager.getInstance().w_tel_1 +"-"+CreditCardInfosManager.getInstance().w_tel_2;
+        if(!TextUtils.isEmpty(manager.w_tel_3)){
+            companyTel = companyTel + "-" + manager.w_tel_3;
+        }
+        editCompanyTel.setText(companyTel);
+        //
         editWorkLife.setText(CreditCardInfosManager.getInstance().w_age);
 
         //亲属

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

@@ -62,6 +62,8 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
     CompleteCommitEditText etCompanyPhoneNo;
     @BindView(R.id.et_company_phone_q)
     CompleteCommitEditText etCompanyPhoneQ;
+    @BindView(R.id.et_company_phone_f)
+    CompleteCommitEditText etCompanyPhoneF;
     @BindView(R.id.et_work_year)
     CompleteCommitEditText etWorkYear;
     @BindView(R.id.et_ir_name)
@@ -159,9 +161,9 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         setOnCompleteEdit(etCity,"p_city");
         setOnCompleteEdit(etAddress,"p_address");
         setOnCompleteEdit(etEmail,"p_email");
-        rbY.setTag("Y");
-        rbN.setTag("N");
-        rbO.setTag("O");
+        rbY.setTag(CreditCardInfosManager.MARRY_Y);
+        rbN.setTag(CreditCardInfosManager.MARRY_N);
+        rbO.setTag(CreditCardInfosManager.MARRY_O);
         //p_marray
         rgMarray.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
@@ -237,9 +239,8 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 tvIdCardExpire.setVisibility(isChecked ? View.GONE : View.VISIBLE);
                 if(isChecked){
-                    String expire = "2099/12/31";
-                    CreditCardInfosManager.getInstance().o_id_expire = expire;
-                    presenter.commitFormData("o_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
+                    CreditCardInfosManager.getInstance().o_id_expire = CreditCardInfosManager.EXPIRE_LONG;
+                    presenter.commitFormData("o_id_expire",CreditCardInfosManager.EXPIRE_LONG,CreditCardInfosManager.getInstance().card_id);
                 }
                 else CreditCardInfosManager.getInstance().o_id_expire = tvIdCardExpire.getText().toString();
 
@@ -432,13 +433,12 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         }
 
         //有效期
-        if(TextUtils.isEmpty(tvIdCardExpire.getText().toString())){
+        if(!cbExpire.isChecked() && TextUtils.isEmpty(tvIdCardExpire.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;
@@ -504,6 +504,12 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         map.put("w_tel_2",w_tel_2);
         manager.w_tel_2 = w_tel_2;
 
+        String w_tel_3 = etCompanyPhoneF.getText().toString();
+        if(!TextUtils.isEmpty(w_tel_3)){
+            map.put("w_tel_3",w_tel_3);
+            manager.w_tel_3 = w_tel_3;
+        }
+
         String w_age = etWorkYear.getText().toString();
         map.put("w_age",w_age);
         manager.w_age = w_age;

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

@@ -26,6 +26,11 @@ public class CreditCardInfosManager {
         return instance;
     }
 
+    public static final String EXPIRE_LONG = "2099/12/31";
+    public static final String MARRY_Y = "Y";
+    public static final String MARRY_N = "N";
+    public static final String MARRY_O = "O";
+
     public void clearAllDatas(){
         card_id = "";//卡类型
         b_name = "";
@@ -75,6 +80,7 @@ public class CreditCardInfosManager {
     public String w_address;
     public String w_tel_1;
     public String w_tel_2;
+    public String w_tel_3;
     public String w_age;
     public String c_d_name;
     public String c_d_mobile;

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

@@ -1,13 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.widget.PopupWindow;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ListPopuWindow extends PopupWindow{
-
-
-
-}

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

@@ -36,6 +36,10 @@
                         android:hint="重要信息，请正确填写"
                         android:enabled="false"/>
 
+                    <CheckBox
+                        android:id="@+id/cbx_expire_long"
+                        style="@style/checkbox_creditcard_marry_style"
+                        android:text="长期有效"/>
                 </LinearLayout>
 
                 <LinearLayout style="@style/creditCardInputItemStyle">

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

@@ -178,6 +178,12 @@
                         android:layout_weight="3"
                         android:hint="电话号码"
                         android:inputType="number"/>
+                    <com.kfzs.libs.widget.CompleteCommitEditText
+                        android:id="@+id/et_company_phone_f"
+                        style="@style/creditCardInputItemEtStyle"
+                        android:layout_weight="2"
+                        android:hint="分机号(选填)"
+                        android:inputType="number"/>
                 </LinearLayout>
 
                 <LinearLayout style="@style/creditCardInputItemStyle">
@@ -307,7 +313,7 @@
                     <com.kfzs.libs.widget.CompleteCommitEditText
                         android:id="@+id/et_car_no"
                         style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
+                        android:hint="车牌号(选填)"
                          />
 
                 </LinearLayout>
@@ -322,13 +328,13 @@
                         android:id="@+id/et_home_q"
                         style="@style/creditCardInputItemEtStyle"
                         android:layout_weight="1"
-                        android:hint="区号"
+                        android:hint="区号(选填)"
                         android:inputType="number"/>
                     <com.kfzs.libs.widget.CompleteCommitEditText
                         android:id="@+id/et_home_phone"
                         style="@style/creditCardInputItemEtStyle"
                         android:layout_weight="3"
-                        android:hint="电话号码"
+                        android:hint="电话号码(选填)"
                         android:inputType="number"/>
                 </LinearLayout>
 
@@ -341,7 +347,7 @@
                     <com.kfzs.libs.widget.CompleteCommitEditText
                         android:id="@+id/et_qq"
                         style="@style/creditCardInputItemEtStyle"
-                        android:hint="常用QQ号"
+                        android:hint="常用QQ号(选填)"
                         android:inputType="number"
                          />
 

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;