将整个信用卡模块添加到主界面的Tab上

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCard.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.webkit.WebView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.groups.creditcard.ApplyForCreditCardActivity;
 import com.sheep.jiuyan.samllsheep.R;
 
 /**
@@ -19,8 +18,8 @@ public class FgtCreditCard extends BaseCompatFragment{
 
     @Override
     protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_bp);
-        startActivity(new Intent(getActivity(), ApplyForCreditCardActivity.class));
+//        setContentView(R.layout.fgt_bp);
+//        startActivity(new Intent(getActivity(), ApplyForCreditCardActivity.class));
     }
 
 }

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -7,6 +7,7 @@ import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.fragment.FgtBorrowPlay;
 import com.kfzs.duanduan.fragment.FgtCreditCard;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
+import com.sheep.groups.creditcard.ApplyForCardTabFragment;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.VipStyle;
 import com.kfzs.duanduan.fragment.FgtMainCategory;
@@ -85,7 +86,7 @@ public enum MainTab {
     CreditCard(R.string.tab_viewpager_credit_card, 4) {
         @Override
         public Fragment getFragment() {
-            return new FgtCreditCard();
+            return new ApplyForCardTabFragment();
         }
 
         @Override

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

@@ -0,0 +1,131 @@
+package com.sheep.groups.creditcard;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
+import android.util.Log;
+import android.util.TypedValue;
+import android.widget.LinearLayout;
+
+import com.kfzs.libs.widget.loading.SupportLoadingFragment;
+import com.kfzs.libs.widget.navigation.NavigationBar;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.R;
+
+import butterknife.BindView;
+
+/**
+ * Created by guoxin on 2018/4/3.
+ */
+
+public class ApplyForCardTabFragment extends SupportLoadingFragment implements OnNextStepCallback,ApplyForCreditCardCommitFragment.OnLastCommitCallback{
+
+    public static final int STEP_BASICS = 0;
+    public static final int STEP_DETAILS = 1;
+    public static final int STEP_COMMIT = 2;
+
+    @BindView(R.id.navigationbar)
+    NavigationBar navigationBar;
+    @BindView(R.id.ll_credit_card_step1)
+    LinearLayout llStep1;
+    @BindView(R.id.ll_credit_card_step2)
+    LinearLayout llStep2;
+    @BindView(R.id.ll_credit_card_step3)
+    LinearLayout llStep3;
+    private ApplyForCreditCardBasicInfoFragment basicInfoFragment;
+    private ApplyForCreditCardDetailsFragment detailsFragment;
+    //
+    private int curStepType = STEP_BASICS;
+    private ApplyForCreditCardCommitFragment commitFragment;
+
+    @Override
+    public int layoutResId() {
+        return R.layout.activity_apply_for_credit_card;
+    }
+
+    @Override
+    public void setupViews(@Nullable Bundle savedInstanceState) {
+
+        navigationBar
+                .titleText("中国民生银行信用卡")
+                .titleTextSize(TypedValue.COMPLEX_UNIT_SP,17)
+                .titleTextColor(android.R.color.black)
+                .changeNavigationType(NavigationBar.IOS);
+
+        llStep1.setSelected(true);
+
+        basicInfoFragment = (ApplyForCreditCardBasicInfoFragment) getChildFragmentManager().findFragmentByTag(ApplyForCreditCardBasicInfoFragment.class.getSimpleName());
+        if(savedInstanceState == null){
+            basicInfoFragment = new ApplyForCreditCardBasicInfoFragment();
+            basicInfoFragment.setOnNextStepCallback(this);
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .add(R.id.fl_credit_card_container, basicInfoFragment,ApplyForCreditCardBasicInfoFragment.class.getSimpleName())
+                    .commit();
+        }
+
+    }
+
+    @Override
+    public void onNextStep(int stepType) {
+        Log.e("BasicInfoPresenter", "act-onNextStep: " );
+        switch (stepType){
+            case STEP_BASICS:
+                openDetails();
+                break;
+            case STEP_DETAILS:
+                openCommit();
+                break;
+            case STEP_COMMIT:
+                llStep3.setSelected(false);
+                getChildFragmentManager().popBackStackImmediate(ApplyForCreditCardCommitFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                break;
+        }
+
+    }
+
+    private void openDetails(){
+        llStep2.setSelected(true);
+
+        detailsFragment = (ApplyForCreditCardDetailsFragment) getChildFragmentManager().findFragmentByTag(ApplyForCreditCardDetailsFragment.class.getSimpleName());
+
+        if(detailsFragment == null){
+            detailsFragment = new ApplyForCreditCardDetailsFragment();
+            detailsFragment.setOnNextStepCallback(this);
+        }
+
+        getChildFragmentManager()
+                .beginTransaction()
+                .add(R.id.fl_credit_card_container,detailsFragment,ApplyForCreditCardDetailsFragment.class.getSimpleName())
+                .addToBackStack(ApplyForCreditCardDetailsFragment.class.getSimpleName())
+                .commit();
+        Log.e("BasicInfoPresenter", "openDetails: " );
+    }
+
+    private void openCommit(){
+        llStep3.setSelected(true);
+
+        commitFragment = (ApplyForCreditCardCommitFragment) getChildFragmentManager().findFragmentByTag(ApplyForCreditCardCommitFragment.class.getSimpleName());
+        if (commitFragment == null) {
+            commitFragment = new ApplyForCreditCardCommitFragment();
+            commitFragment.setOnNextStepCallback(this);
+            commitFragment.setOnLastCommitCallback(this);
+        }
+
+        getChildFragmentManager()
+                .beginTransaction()
+                .add(R.id.fl_credit_card_container,commitFragment,ApplyForCreditCardCommitFragment.class.getSimpleName())
+                .addToBackStack(ApplyForCreditCardCommitFragment.class.getSimpleName())
+                .commit();
+    }
+
+    @Override
+    public void lastCommit() {
+        llStep3.setSelected(false);
+        getChildFragmentManager().popBackStackImmediate(ApplyForCreditCardCommitFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        llStep2.setSelected(false);
+        getChildFragmentManager().popBackStackImmediate(ApplyForCreditCardDetailsFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        basicInfoFragment.clearAllDatas();
+        Jump2View.getInstance().goHomePageView(activity,0);
+    }
+}

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

@@ -1,125 +1,135 @@
-package com.sheep.groups.creditcard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.text.style.ForegroundColorSpan;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.kfzs.libs.widget.navigation.Navigation;
-import com.kfzs.libs.widget.navigation.NavigationBar;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.lang.ref.WeakReference;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ApplyForCreditCardActivity extends AppCompatActivity implements OnNextStepCallback{
-
-    public static final int STEP_BASICS = 0;
-    public static final int STEP_DETAILS = 1;
-    public static final int STEP_COMMIT = 2;
-
-    @BindView(R.id.navigationbar)
-    NavigationBar navigationBar;
-    @BindView(R.id.ll_credit_card_step1)
-    LinearLayout llStep1;
-    @BindView(R.id.ll_credit_card_step2)
-    LinearLayout llStep2;
-    @BindView(R.id.ll_credit_card_step3)
-    LinearLayout llStep3;
-    private ApplyForCreditCardBasicInfoFragment basicInfoFragment;
-    private ApplyForCreditCardDetailsFragment detailsFragment;
-    //
-    private int curStepType = STEP_BASICS;
-    private ApplyForCreditCardCommitFragment commitFragment;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_apply_for_credit_card);
-        ButterKnife.bind(this);
-
-        navigationBar
-                .titleText("中国民生银行信用卡")
-                .titleTextSize(TypedValue.COMPLEX_UNIT_SP,17)
-                .titleTextColor(android.R.color.black)
-                .changeNavigationType(NavigationBar.IOS);
-
-        llStep1.setSelected(true);
-
-        basicInfoFragment = (ApplyForCreditCardBasicInfoFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardBasicInfoFragment.class.getSimpleName());
-        if(savedInstanceState == null){
-            basicInfoFragment = new ApplyForCreditCardBasicInfoFragment();
-            getSupportFragmentManager()
-                    .beginTransaction()
-                    .add(R.id.fl_credit_card_container, basicInfoFragment,ApplyForCreditCardBasicInfoFragment.class.getSimpleName())
-                    .commit();
-        }
-
-    }
-
-
-
-    @Override
-    public void onNextStep(int stepType) {
-        Log.e("BasicInfoPresenter", "act-onNextStep: " );
-        switch (stepType){
-            case STEP_BASICS:
-                openDetails();
-                break;
-            case STEP_DETAILS:
-                openCommit();
-                break;
-            case STEP_COMMIT:
-                break;
-        }
-
-
-    }
-
-    private void openDetails(){
-        llStep2.setSelected(true);
-
-        detailsFragment = (ApplyForCreditCardDetailsFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardDetailsFragment.class.getSimpleName());
-
-        if(detailsFragment == null){
-            detailsFragment = new ApplyForCreditCardDetailsFragment();
-        }
-
-        getSupportFragmentManager()
-                .beginTransaction()
-                .add(R.id.fl_credit_card_container,detailsFragment,ApplyForCreditCardDetailsFragment.class.getSimpleName())
-                .commit();
-        Log.e("BasicInfoPresenter", "openDetails: " );
-    }
-
-    private void openCommit(){
-        llStep3.setSelected(true);
-
-        commitFragment = (ApplyForCreditCardCommitFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardCommitFragment.class.getSimpleName());
-        if (commitFragment == null) {
-            commitFragment = new ApplyForCreditCardCommitFragment();
-        }
-
-        getSupportFragmentManager()
-                .beginTransaction()
-                .add(R.id.fl_credit_card_container,commitFragment,ApplyForCreditCardCommitFragment.class.getSimpleName())
-                .commit();
-    }
-}
+//package com.sheep.groups.creditcard;
+//
+//import android.app.Activity;
+//import android.content.Context;
+//import android.graphics.Color;
+//import android.support.v4.app.FragmentManager;
+//import android.support.v7.app.AppCompatActivity;
+//import android.os.Bundle;
+//import android.text.SpannableString;
+//import android.text.SpannableStringBuilder;
+//import android.text.Spanned;
+//import android.text.TextPaint;
+//import android.text.method.LinkMovementMethod;
+//import android.text.style.ClickableSpan;
+//import android.text.style.ForegroundColorSpan;
+//import android.util.Log;
+//import android.util.TypedValue;
+//import android.view.View;
+//import android.widget.LinearLayout;
+//import android.widget.TextView;
+//import android.widget.Toast;
+//
+//import com.kfzs.libs.widget.navigation.Navigation;
+//import com.kfzs.libs.widget.navigation.NavigationBar;
+//import com.sheep.jiuyan.samllsheep.R;
+//
+//import java.lang.ref.WeakReference;
+//
+//import butterknife.BindView;
+//import butterknife.ButterKnife;
+//
+//public class ApplyForCreditCardActivity extends AppCompatActivity implements OnNextStepCallback{
+//
+//    public static final int STEP_BASICS = 0;
+//    public static final int STEP_DETAILS = 1;
+//    public static final int STEP_COMMIT = 2;
+//
+//    @BindView(R.id.navigationbar)
+//    NavigationBar navigationBar;
+//    @BindView(R.id.ll_credit_card_step1)
+//    LinearLayout llStep1;
+//    @BindView(R.id.ll_credit_card_step2)
+//    LinearLayout llStep2;
+//    @BindView(R.id.ll_credit_card_step3)
+//    LinearLayout llStep3;
+//    private ApplyForCreditCardBasicInfoFragment basicInfoFragment;
+//    private ApplyForCreditCardDetailsFragment detailsFragment;
+//    //
+//    private int curStepType = STEP_BASICS;
+//    private ApplyForCreditCardCommitFragment commitFragment;
+//
+//
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_apply_for_credit_card);
+//        ButterKnife.bind(this);
+//
+//        navigationBar
+//                .titleText("中国民生银行信用卡")
+//                .titleTextSize(TypedValue.COMPLEX_UNIT_SP,17)
+//                .titleTextColor(android.R.color.black)
+//                .changeNavigationType(NavigationBar.IOS);
+//
+//        llStep1.setSelected(true);
+//
+//        basicInfoFragment = (ApplyForCreditCardBasicInfoFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardBasicInfoFragment.class.getSimpleName());
+//        if(savedInstanceState == null){
+//            basicInfoFragment = new ApplyForCreditCardBasicInfoFragment();
+//            getSupportFragmentManager()
+//                    .beginTransaction()
+//                    .add(R.id.fl_credit_card_container, basicInfoFragment,ApplyForCreditCardBasicInfoFragment.class.getSimpleName())
+//                    .commit();
+//        }
+//
+//    }
+//
+//
+//
+//    @Override
+//    public void onNextStep(int stepType) {
+//        Log.e("BasicInfoPresenter", "act-onNextStep: " );
+//        switch (stepType){
+//            case STEP_BASICS:
+//                openDetails();
+//                break;
+//            case STEP_DETAILS:
+//                openCommit();
+//                break;
+//            case STEP_COMMIT:
+//                llStep3.setSelected(false);
+//                getSupportFragmentManager().popBackStackImmediate(ApplyForCreditCardCommitFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+//                break;
+//        }
+//
+//
+//    }
+//
+//    private void openDetails(){
+//        llStep2.setSelected(true);
+//
+//        detailsFragment = (ApplyForCreditCardDetailsFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardDetailsFragment.class.getSimpleName());
+//
+//        if(detailsFragment == null){
+//            detailsFragment = new ApplyForCreditCardDetailsFragment();
+//        }
+//
+//        getSupportFragmentManager()
+//                .beginTransaction()
+//                .add(R.id.fl_credit_card_container,detailsFragment,ApplyForCreditCardDetailsFragment.class.getSimpleName())
+////                .addToBackStack(ApplyForCreditCardDetailsFragment.class.getSimpleName())
+//                .commit();
+//        Log.e("BasicInfoPresenter", "openDetails: " );
+//    }
+//
+//    private void openCommit(){
+//        llStep3.setSelected(true);
+//
+//        commitFragment = (ApplyForCreditCardCommitFragment) getSupportFragmentManager().findFragmentByTag(ApplyForCreditCardCommitFragment.class.getSimpleName());
+//        if (commitFragment == null) {
+//            commitFragment = new ApplyForCreditCardCommitFragment();
+//        }
+//
+//        getSupportFragmentManager()
+//                .beginTransaction()
+//                .add(R.id.fl_credit_card_container,commitFragment,ApplyForCreditCardCommitFragment.class.getSimpleName())
+//                .addToBackStack(ApplyForCreditCardCommitFragment.class.getSimpleName())
+//                .commit();
+//    }
+//
+//    @Override
+//    public void onBackPressed() {
+//        finish();
+//    }
+//}

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

@@ -73,15 +73,21 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
     private CreditCardDisplayFragment normalCardDisplayFragment;
     private CreditCardDisplayFragment goldCardDisplayFragment;
     private int curType = CreditCardDisplayFragment.CARD_TYPE_NORMAL;
+    private CountDownUtil countDownUtil;
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            onNextStepCallback = (OnNextStepCallback) context;
-        }
-        catch (ClassCastException e){
-        }
+//    @Override
+//    public void onAttach(Context context) {
+//        super.onAttach(context);
+//        try {
+//            onNextStepCallback = (OnNextStepCallback) context;
+//        }
+//        catch (ClassCastException e){
+//        }
+//    }
+
+
+    public void setOnNextStepCallback(OnNextStepCallback onNextStepCallback) {
+        this.onNextStepCallback = onNextStepCallback;
     }
 
     @Override
@@ -94,6 +100,22 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
                 .inject(this);
     }
 
+    public void clearAllDatas(){
+        etName.setText("");
+        etMobile.setText("");
+        etIdNo.setText("");
+        etDynamic.setText("");
+
+        btnCardNormal.performClick();
+        if(normalCardDisplayFragment != null){
+            normalCardDisplayFragment.viewPager.setCurrentItem(0);
+        }
+        if(countDownUtil != null){
+            countDownUtil.reset();
+        }
+        CreditCardInfosManager.getInstance().clearAllDatas();
+    }
+
     @Override
     public IPresenter currentPresenter() {
         return presenter;
@@ -112,6 +134,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
     @Override
     public void setupViews(@Nullable Bundle savedInstanceState) {
 
+
         SpannableStringBuilder builder = new SpannableStringBuilder();
         builder.append("点击\"下一步\"意味着您已阅读、知晓并同意遵守中国民生银行信用卡");
         //申请须知
@@ -126,7 +149,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         tvAgreement.setText(builder);
         tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());//加上这句话,点击才有效果
 
-        btnCardNormal.performClick();
+
 
         etName.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
             @Override
@@ -164,8 +187,29 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         });
 
 
+        if(normalCardDisplayFragment == null){
+            normalCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_NORMAL);
+        }
+
+        if(goldCardDisplayFragment == null){
+            goldCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_GOLD);
+        }
+
+        btnCardNormal.performClick();
+
+        //页面进入时统计
+        Map<String,String> map = new HashMap<>();
+        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
+        map.put("key","first_enter");
+        map.put("card_id",getCardId());
+        presenter.statisticsBasics(map);
+
+//        test();
     }
 
+
+
+
     private void sendDynamic(){
 
         if(TextUtils.isEmpty(etName.getText().toString())){
@@ -198,7 +242,9 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         map.put("card_id",getCardId());
         Log.e(TAG, "sendDynamic: "+map.toString());
         presenter.getDynamic(map);
-        new CountDownUtil(tvDynamic)
+        //倒计时60000ms
+        //不同状态字体颜色
+        countDownUtil = new CountDownUtil(tvDynamic)
                 .setCountDownMillis(60_000L)//倒计时60000ms
                 .setCountDownColor(R.color.credit_blue_color,R.color.credit_blue_color)//不同状态字体颜色
                 .start();
@@ -259,7 +305,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         manager.b_sms = etDynamic.getText().toString();
         manager.ticket = presenter.getTicket();
 
-        onNextStepCallback.onNextStep(ApplyForCreditCardActivity.STEP_BASICS);
+        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_BASICS);
     }
 
     @Override
@@ -289,7 +335,6 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         switch (view.getId()){
             case R.id.btn_next:
                 clickBtnNext();
-//                goNext();
                 break;
             case R.id.btn_card_normal:
                 selectNormalCard();
@@ -338,9 +383,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         btnCardNormal.setSelected(true);
         btnCardGold.setSelected(false);
 
-        if(normalCardDisplayFragment == null){
-            normalCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_NORMAL);
-        }
+
 
         curType = CreditCardDisplayFragment.CARD_TYPE_NORMAL;
 
@@ -353,9 +396,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
         btnCardNormal.setSelected(false);
         btnCardGold.setSelected(true);
 
-        if(goldCardDisplayFragment == null){
-            goldCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_GOLD);
-        }
+
 
         curType = CreditCardDisplayFragment.CARD_TYPE_GOLD;
         getChildFragmentManager()

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

@@ -3,10 +3,12 @@ package com.sheep.groups.creditcard;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.Toast;
 
 import com.kfzs.libs.DaggerFragment;
 import com.kfzs.libs.IPresenter;
@@ -69,14 +71,19 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
 
     private OnNextStepCallback onNextStepCallback;
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            onNextStepCallback = (OnNextStepCallback) context;
-        }
-        catch (ClassCastException e){
-        }
+//    @Override
+//    public void onAttach(Context context) {
+//        super.onAttach(context);
+//        try {
+//            onNextStepCallback = (OnNextStepCallback) context;
+//        }
+//        catch (ClassCastException e){
+//        }
+//    }
+
+
+    public void setOnNextStepCallback(OnNextStepCallback onNextStepCallback) {
+        this.onNextStepCallback = onNextStepCallback;
     }
 
     @Override
@@ -103,7 +110,7 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
     public void setupViews(@Nullable Bundle savedInstanceState) {
 
         //身份证日期
-        editCardTime.setText(CreditCardInfosManager.getInstance().c_id_expire);
+        editCardTime.setText(CreditCardInfosManager.getInstance().o_id_expire);
 
         editAddressOrigin.setText(CreditCardInfosManager.getInstance().p_city);
         editAddressNow.setText(CreditCardInfosManager.getInstance().p_address);
@@ -125,7 +132,7 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         editCompanyName.setText(CreditCardInfosManager.getInstance().w_name);
         editCompanyCity.setText(CreditCardInfosManager.getInstance().w_city);
         editCompanyAddress.setText(CreditCardInfosManager.getInstance().w_address);
-        editCompanyTel.setText(CreditCardInfosManager.getInstance().w_tel);
+        editCompanyTel.setText(CreditCardInfosManager.getInstance().w_tel_1 +"-"+CreditCardInfosManager.getInstance().w_tel_2);
         editWorkLife.setText(CreditCardInfosManager.getInstance().w_age);
 
         //亲属
@@ -140,6 +147,7 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         sb.append(CreditCardInfosManager.getInstance().c_o_mobile);
         editRelationshipOther.setText(sb.toString());
 
+
     }
 
     @Override
@@ -160,10 +168,8 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
     public void onClick(View view){
         switch (view.getId()){
             case R.id.btn_commit_info:
-
-                //todo 将数据提交到服务器接口
-
-
+                Toast.makeText(activity,"申请成功",Toast.LENGTH_SHORT).show();
+                onLastCommitCallback.lastCommit();
                 break;
             case R.id.btn_modify_infos:
                 goNext();
@@ -183,6 +189,16 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
 
     @Override
     public void goNext() {
-        onNextStepCallback.onNextStep(ApplyForCreditCardActivity.STEP_DETAILS);
+        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_COMMIT);
+    }
+
+    OnLastCommitCallback onLastCommitCallback;
+
+    public void setOnLastCommitCallback(OnLastCommitCallback onLastCommitCallback) {
+        this.onLastCommitCallback = onLastCommitCallback;
+    }
+
+    public interface OnLastCommitCallback{
+        void lastCommit();
     }
 }

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

@@ -13,6 +13,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.DatePicker;
+import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -25,6 +26,7 @@ import com.kfzs.libs.widget.CompleteCommitEditText;
 import com.kfzs.libs.widget.alpha.AlphaButton;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -83,6 +85,12 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 
     @BindView(R.id.rg_marray)
     RadioGroup rgMarray;
+    @BindView(R.id.rb_marray_y)
+    RadioButton rbY;
+    @BindView(R.id.rb_marray_n)
+    RadioButton rbN;
+    @BindView(R.id.rb_marray_o)
+    RadioButton rbO;
     @BindView(R.id.cb_agreement)
     CheckBox cbAgreement;
     @BindView(R.id.sp_relationship_immediate_relatives)
@@ -101,14 +109,19 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
     private ArrayAdapter<CharSequence> adapterImmediateRelatives;
     private ArrayAdapter<CharSequence> adapterOther;
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            onNextStepCallback = (OnNextStepCallback) context;
-        }
-        catch (ClassCastException e){
-        }
+//    @Override
+//    public void onAttach(Context context) {
+//        super.onAttach(context);
+//        try {
+//            onNextStepCallback = (OnNextStepCallback) context;
+//        }
+//        catch (ClassCastException e){
+//        }
+//    }
+
+
+    public void setOnNextStepCallback(OnNextStepCallback onNextStepCallback) {
+        this.onNextStepCallback = onNextStepCallback;
     }
 
     @Override
@@ -134,6 +147,8 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
     @Override
     public void setupViews(@Nullable Bundle savedInstanceState) {
 
+
+
         adapterImmediateRelatives = ArrayAdapter.createFromResource(activity, R.array.credit_card_relationship_immediate_relatives_type, R.layout.spinner_text_item);
         spImmediateRelationship.setAdapter(adapterImmediateRelatives);
 
@@ -144,20 +159,23 @@ 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");
         //p_marray
         rgMarray.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
-                String value = (String) group.findViewById(group.getCheckedRadioButtonId()).getTag();
-//                if(checkedId == R.id.rb_marray_n){
-//
-//                }
-//                else if(checkedId == R.id.rb_marray_y){
-//
-//                }
-//                else if(checkedId == R.id.rb_marray_o){
-//
-//                }
+                String value = "";
+                if(checkedId == R.id.rb_marray_n){
+                    value = (String) rbN.getTag();
+                }
+                else if(checkedId == R.id.rb_marray_y){
+                    value = (String) rbY.getTag();
+                }
+                else if(checkedId == R.id.rb_marray_o){
+                    value = (String) rbO.getTag();
+                }
                 presenter.commitFormData("p_marray",value,CreditCardInfosManager.getInstance().card_id);
                 CreditCardInfosManager.getInstance().p_marray = value;
             }
@@ -173,6 +191,7 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         setOnCompleteEdit(etWorkYear,"w_age");
         setOnCompleteEdit(etIRName,"c_d_name");
         setOnCompleteEdit(etIRMobile,"c_d_mobile");
+        CreditCardInfosManager.getInstance().c_d_relation = adapterImmediateRelatives.getItem(0).toString();
         //c_d_relation
         spImmediateRelationship.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -187,12 +206,12 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 
             }
         });
-
+        CreditCardInfosManager.getInstance().c_o_relation = adapterOther.getItem(0).toString();
         //c_o_relation
         spOtherRelationship.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String value = (String) adapterOther.getItem(position);
+                String value =  adapterOther.getItem(position).toString();
                 CreditCardInfosManager.getInstance().c_d_relation = value;
                 presenter.commitFormData("c_o_relation",value,CreditCardInfosManager.getInstance().card_id);
             }
@@ -208,21 +227,21 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         tvIdCardExpire.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //显示日历，key为c_id_expire
+                //显示日历，key为o_id_expire
                 showDatePicker();
             }
         });
-        //c_id_expire
+        //o_id_expire
         cbExpire.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 tvIdCardExpire.setVisibility(isChecked ? View.GONE : View.VISIBLE);
                 if(isChecked){
-                    String expire = "2099-12-31";
-                    CreditCardInfosManager.getInstance().c_id_expire = expire;
-                    presenter.commitFormData("c_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
+                    String expire = "2099/12/31";
+                    CreditCardInfosManager.getInstance().o_id_expire = expire;
+                    presenter.commitFormData("o_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
                 }
-                else CreditCardInfosManager.getInstance().c_id_expire = tvIdCardExpire.getText().toString();
+                else CreditCardInfosManager.getInstance().o_id_expire = tvIdCardExpire.getText().toString();
 
             }
         });
@@ -233,6 +252,7 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         setOnCompleteEdit(etCarNo,"o_p_number");
 //        setOnCompleteEdit(etHomeQ,"p_city");
         setOnCompleteEditDouble(etHomePhone,etHomeQ,"o_tel");//要取得两个值，所以单独设置
+        etQQ.setAfterTextChangedCanComplete(true);
         setOnCompleteEdit(etQQ,"o_qq");
         //is_agree
         cbAgreement.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -243,6 +263,41 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             }
         });
 
+        //页面进入时统计
+        Map<String,String> map = new HashMap<>();
+        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
+        map.put("key","second_enter");
+        map.put("card_id",CreditCardInfosManager.getInstance().card_id);
+        presenter.statisticsDetails(map);
+
+
+//        test();
+    }
+
+
+    private void test(){
+
+        etCity.setText("成都");
+        etAddress.setText("成都市高新区天府二街软件园");
+        etEmail.setText("506578835@qq.com");
+        rgMarray.check(R.id.rb_marray_n);
+        etEducation.setText("大学");
+        etCompanyCity.setText("成都");
+        etCompanyName.setText("成都云端助手有限公司");
+        etCompanyAddress.setText("成都市高新区天府二街蜀都中心");
+        etCompanyPhoneQ.setText("028");
+        etCompanyPhoneNo.setText("84074658");
+        etWorkYear.setText("7");
+        etIRName.setText("郭伟伟");
+        etIRMobile.setText("18608004678");
+        etOtherName.setText("黄明明");
+        etOtherMobile.setText("15946587456");
+        tvIdCardExpire.setText("2087/12/11");
+        etCarNo.setText("川A4554DH");
+        etHomeQ.setText("028");
+        etHomePhone.setText("84074663");
+        etQQ.setText("506578835");
+        cbAgreement.setChecked(true);
 
     }
 
@@ -259,10 +314,10 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         new DatePickerDialog(activity, new DatePickerDialog.OnDateSetListener() {
             @Override
             public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
-                String expire = year + "-" + month + "-" + dayOfMonth;
+                String expire = year + "/" + month + "/" + dayOfMonth;
                 tvIdCardExpire.setText(expire);
-                CreditCardInfosManager.getInstance().c_id_expire = expire;
-                presenter.commitFormData("c_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
+                CreditCardInfosManager.getInstance().o_id_expire = expire;
+                presenter.commitFormData("o_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
             }
         },year,monthOfYear,dayOfMonth).show();
 
@@ -303,6 +358,13 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             Toast.makeText(activity,"请填写电子邮箱",Toast.LENGTH_SHORT).show();
             return;
         }
+
+        if(!RegexUtils.isEmail(etEmail.getText().toString())){
+            Toast.makeText(activity,"电子邮箱格式不正确",Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+
         if(TextUtils.isEmpty(CreditCardInfosManager.getInstance().p_marray)){
             Toast.makeText(activity,"请选择婚姻状况",Toast.LENGTH_SHORT).show();
             return;
@@ -323,6 +385,11 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             Toast.makeText(activity,"请填写单位电话",Toast.LENGTH_SHORT).show();
             return;
         }
+//        if(RegexUtils.isTel(etCompanyPhoneNo.getText().toString() +"- "+ etCompanyPhoneQ.getText().toString())){
+//            Toast.makeText(activity,"单位电话格式不正确",Toast.LENGTH_SHORT).show();
+//            return;
+//        }
+
         if(TextUtils.isEmpty(etWorkYear.getText().toString())){
             Toast.makeText(activity,"请填写工作年限",Toast.LENGTH_SHORT).show();
             return;
@@ -335,6 +402,11 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             Toast.makeText(activity,"请填写直属亲属手机号",Toast.LENGTH_SHORT).show();
             return;
         }
+        if(!RegexUtils.isMobileSimple(etIRMobile.getText().toString())){
+            Toast.makeText(activity,"直属亲属手机号不正确",Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         if(TextUtils.isEmpty(CreditCardInfosManager.getInstance().c_d_relation)){
             Toast.makeText(activity,"请选择直属亲属关系",Toast.LENGTH_SHORT).show();
             return;
@@ -348,6 +420,12 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             Toast.makeText(activity,"请填写其他联系人手机号",Toast.LENGTH_SHORT).show();
             return;
         }
+
+        if(!RegexUtils.isMobileSimple(etOtherMobile.getText().toString())){
+            Toast.makeText(activity,"其他联系人手机号不正确",Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         if(TextUtils.isEmpty(CreditCardInfosManager.getInstance().c_o_relation)){
             Toast.makeText(activity,"请选择其他联系人关系",Toast.LENGTH_SHORT).show();
             return;
@@ -362,11 +440,17 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
             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;
@@ -407,9 +491,13 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         map.put("w_address",w_address);
         manager.w_address = w_address;
 
-        String w_tel = etCompanyPhoneQ.getText().toString() + etCompanyPhoneNo.getText().toString();
-        map.put("w_tel",w_tel);
-        manager.w_tel = w_tel;
+        String w_tel_1 = etCompanyPhoneQ.getText().toString();
+        map.put("w_tel_1",w_tel_1);
+        manager.w_tel_1 = w_tel_1;
+
+        String w_tel_2 = etCompanyPhoneNo.getText().toString();
+        map.put("w_tel_2",w_tel_2);
+        manager.w_tel_2 = w_tel_2;
 
         String w_age = etWorkYear.getText().toString();
         map.put("w_age",w_age);
@@ -436,27 +524,39 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         map.put("c_o_relation",CreditCardInfosManager.getInstance().c_o_relation);
 
         if(cbExpire.isChecked()){
-            map.put("c_id_expire",CreditCardInfosManager.getInstance().c_id_expire);
+            map.put("o_id_expire",CreditCardInfosManager.getInstance().o_id_expire);
         }
         else {
-            String c_id_expire = tvIdCardExpire.getText().toString();
-            map.put("c_id_expire",c_id_expire);
-            manager.c_id_expire = c_id_expire;
+            String o_id_expire = tvIdCardExpire.getText().toString();
+            map.put("o_id_expire",o_id_expire);
+            manager.o_id_expire = o_id_expire;
         }
 
         String o_p_number = etCarNo.getText().toString();
         map.put("o_p_number",o_p_number);
         manager.o_p_number = o_p_number;
 
-        String o_tel = etHomeQ.getText().toString() + etHomePhone.getText().toString();
-        map.put("o_tel",o_tel);
-        manager.o_tel = o_tel;
+        String o_tel_1 = etHomeQ.getText().toString();
+        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;
 
         String o_qq = etQQ.getText().toString();
         map.put("o_qq",o_qq);
         manager.o_qq = o_qq;
 
-        map.put("is_agree",String.valueOf(CreditCardInfosManager.getInstance().is_agree));
+        boolean isAgree = CreditCardInfosManager.getInstance().is_agree;
+        map.put("is_agree",isAgree ? "1" : "0");
+
+        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
+        map.put("card_id",manager.card_id);
+
+//        map.put("w_tel_3","876");
+//        map.put("o_tel_3","522");
+
         presenter.commitDetails(map);
     }
 
@@ -473,6 +573,6 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 
     @Override
     public void goNext() {
-        onNextStepCallback.onNextStep(ApplyForCreditCardActivity.STEP_DETAILS);
+        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_DETAILS);
     }
 }

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

@@ -22,6 +22,7 @@ import java.util.Map;
         void commitFormData(String key,String value,String cardId);
         void commitBasic(Map<String,String> map);
         void getDynamic(Map<String,String> map);
+        void  statisticsBasics(Map<String,String> map);
     }
 
 }

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

@@ -181,7 +181,6 @@ public class BasicInfoPresenter implements BasicInfoContact.Presenter {
                     @Override
                     public void onNext(String s) {
                         Log.e(TAG, "onNext: "+s );
-                        view.showProgress(s);
                         //保存ticket
                         try {
                             JSONObject object = new JSONObject(s);
@@ -200,4 +199,29 @@ public class BasicInfoPresenter implements BasicInfoContact.Presenter {
                     }
                 });
     }
+
+    @Override
+    public void statisticsBasics(Map<String,String> map) {
+
+        httpService
+                .commitCreditCardFiled(map)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<String>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Log.e(TAG, "onError: "+e.getMessage() );
+                    }
+
+                    @Override
+                    public void onNext(String s) {
+                        Log.e(TAG, "onNext: "+s );
+                    }
+                });
+    }
 }

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

@@ -26,6 +26,37 @@ public class CreditCardInfosManager {
         return instance;
     }
 
+    public void clearAllDatas(){
+        card_id = "";//卡类型
+        b_name = "";
+        b_mobile = "";
+        b_card = "";//身份证号
+        b_sms = "";
+        ticket = "";
+        p_city = "";
+        p_address = "";
+        p_email = "";
+        p_marray = "";
+        p_edu = "";
+        w_name = "";
+        w_city = "";
+        w_address = "";
+        w_tel_1 = "";
+        w_tel_2 = "";
+        w_age = "";
+        c_d_name = "";
+        c_d_mobile = "";
+        c_d_relation = "";
+        c_o_name = "";
+        c_o_mobile = "";
+        c_o_relation = "";
+        o_id_expire = "";
+        o_p_number = "";
+        o_tel_1 = "";
+        o_tel_2 = "";
+        o_qq = "";
+        is_agree = false;
+    }
 
 
     public String card_id;//卡类型
@@ -42,7 +73,8 @@ public class CreditCardInfosManager {
     public String w_name;
     public String w_city;
     public String w_address;
-    public String w_tel;
+    public String w_tel_1;
+    public String w_tel_2;
     public String w_age;
     public String c_d_name;
     public String c_d_mobile;
@@ -50,9 +82,10 @@ public class CreditCardInfosManager {
     public String c_o_name;
     public String c_o_mobile;
     public String c_o_relation;
-    public String c_id_expire;
+    public String o_id_expire;
     public String o_p_number;
-    public String o_tel;
+    public String o_tel_1;
+    public String o_tel_2;
     public String o_qq;
     public boolean is_agree = false;
 

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

@@ -20,6 +20,7 @@ import java.util.Map;
     interface Presenter extends IPresenter {
         void commitFormData(String key, String value, String cardId);
         void commitDetails(Map<String,String> map);
+        void  statisticsDetails(Map<String,String> map);
     }
 
 }

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

@@ -7,6 +7,9 @@ import com.kfzs.libs.di.http.HttpService;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -83,6 +86,7 @@ public class DetailsPresenter implements DetailsContact.Presenter {
 
     @Override
     public void commitDetails(Map<String, String> map) {
+        Log.e(TAG, "commitDetails: "+map.toString() );
         httpService
                 .commitCreditCardDetails(map)
                 .subscribeOn(Schedulers.io())
@@ -102,8 +106,45 @@ public class DetailsPresenter implements DetailsContact.Presenter {
                     @Override
                     public void onNext(String s) {
                         Log.e(TAG, "onNext: "+s );
-                        view.showProgress(s);
-                        view.goNext();
+
+                        try {
+                            JSONObject object = new JSONObject(s);
+                            if(object.getBoolean("success")){
+                                view.goNext();
+                            }
+                            else {
+                                view.showProgress(object.getString("errors"));
+                            }
+
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+                });
+    }
+
+    @Override
+    public void statisticsDetails(Map<String,String> map) {
+
+        httpService
+                .commitCreditCardFiled(map)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<String>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Log.e(TAG, "onError: "+e.getMessage() );
+                    }
+
+                    @Override
+                    public void onNext(String s) {
+                        Log.e(TAG, "onNext: "+s );
                     }
                 });
     }

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

@@ -93,7 +93,4 @@
         android:paddingTop="16dp"
         />
 
-
-
-
 </LinearLayout>

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

@@ -47,7 +47,6 @@
                         android:id="@+id/et_address"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="详细填写精确到，街道，门牌号"
-                        android:inputType="number"
                         />
 
                 </LinearLayout>
@@ -79,19 +78,16 @@
                         <RadioButton
                             android:id="@+id/rb_marray_n"
                             android:text=" 未婚"
-                            android:tag="N"
                             style="@style/creditCardInputItemRadioBtnStyle" />
 
                         <RadioButton
                             android:id="@+id/rb_marray_y"
                             android:text=" 已婚"
-                            android:tag="Y"
                             style="@style/creditCardInputItemRadioBtnStyle" />
 
                         <RadioButton
                             android:id="@+id/rb_marray_o"
                             android:text=" 其他"
-                            android:tag="O"
                             style="@style/creditCardInputItemRadioBtnStyle" />
 
                     </RadioGroup>
@@ -311,7 +307,6 @@
                     <com.kfzs.libs.widget.CompleteCommitEditText
                         android:id="@+id/et_car_no"
                         style="@style/creditCardInputItemEtStyle"
-                        android:digits="@string/digits_car_no"
                         android:hint="请填写"
                          />
 

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

@@ -16,11 +16,6 @@ import rx.Observable;
 
 public interface HttpService {
 
-    @GET("/")
-    Observable<String> sufferBaidu();
-
-
-
     //表格形式发送
     @FormUrlEncoded
     @POST("credits/cmbc/log")