浏览代码

删除无用资源2

zengjiebin 8 年之前
父节点
当前提交
1c2d21fca3
共有 85 个文件被更改,包括 0 次插入7210 次删除
  1. 0 63
      app/src/main/java/com/sheep/groups/creditcard/AgreementCreditCardDialog.java
  2. 0 153
      app/src/main/java/com/sheep/groups/creditcard/ApplyForCardTabFragment.java
  3. 0 135
      app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardActivity.java
  4. 0 458
      app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardBasicInfoFragment.java
  5. 0 219
      app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardCommitFragment.java
  6. 0 666
      app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardDetailsFragment.java
  7. 0 17
      app/src/main/java/com/sheep/groups/creditcard/BasicInfoComponent.java
  8. 0 28
      app/src/main/java/com/sheep/groups/creditcard/BasicInfoContact.java
  9. 0 227
      app/src/main/java/com/sheep/groups/creditcard/BasicInfoPresenter.java
  10. 0 109
      app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoActivity.java
  11. 0 175
      app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoFragment1.java
  12. 0 167
      app/src/main/java/com/sheep/groups/creditcard/CountDownUtil.java
  13. 0 58
      app/src/main/java/com/sheep/groups/creditcard/CreditCardConfirmDialog.java
  14. 0 199
      app/src/main/java/com/sheep/groups/creditcard/CreditCardDisplayFragment.java
  15. 0 109
      app/src/main/java/com/sheep/groups/creditcard/CreditCardInfosManager.java
  16. 0 42
      app/src/main/java/com/sheep/groups/creditcard/CreditCardKeys.java
  17. 0 15
      app/src/main/java/com/sheep/groups/creditcard/DetailsComponent.java
  18. 0 26
      app/src/main/java/com/sheep/groups/creditcard/DetailsContact.java
  19. 0 153
      app/src/main/java/com/sheep/groups/creditcard/DetailsPresenter.java
  20. 0 15
      app/src/main/java/com/sheep/groups/creditcard/ModifyComponent.java
  21. 0 24
      app/src/main/java/com/sheep/groups/creditcard/ModifyContact.java
  22. 0 97
      app/src/main/java/com/sheep/groups/creditcard/ModifyPresenter.java
  23. 0 9
      app/src/main/java/com/sheep/groups/creditcard/OnNextStepCallback.java
  24. 0 216
      app/src/main/java/com/sheep/groups/creditcard/fragment/CiticStepThreeFragment.java
  25. 0 25
      app/src/main/java/com/sheep/groups/creditcard/ms/MinShengCreditActivity.java
  26. 0 98
      app/src/main/java/com/sheep/groups/creditcard/zx/CreditCardZXManager.java
  27. 0 16
      app/src/main/java/com/sheep/groups/creditcard/zx/TestActivity.java
  28. 0 16
      app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Component.java
  29. 0 32
      app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Contact.java
  30. 0 260
      app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Presenter.java
  31. 0 26
      app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep22Contact.java
  32. 0 86
      app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep22Presenter.java
  33. 0 370
      app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinCreditStep1Activity.java
  34. 0 199
      app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinStep22Fragment.java
  35. 0 5
      app/src/main/res/color/gx_s_credit_card_card_type_btn_text.xml
  36. 0 5
      app/src/main/res/color/gx_s_credit_card_step_text.xml
  37. 0 8
      app/src/main/res/color/selector_color_citic_tv.xml
  38. 二进制
      app/src/main/res/drawable-xhdpi/ic_zx_card.png
  39. 二进制
      app/src/main/res/drawable-xxhdpi/ic_credit_left_black_arrow.png
  40. 二进制
      app/src/main/res/drawable-xxhdpi/ic_credit_left_blue_arrow.png
  41. 二进制
      app/src/main/res/drawable-xxhdpi/ic_credit_right_blue_arrow.png
  42. 二进制
      app/src/main/res/drawable-xxhdpi/ic_discounts.png
  43. 二进制
      app/src/main/res/drawable-xxhdpi/ic_gold_credit_card_1.jpg
  44. 二进制
      app/src/main/res/drawable-xxhdpi/ic_normal_credit_card1.png
  45. 0 15
      app/src/main/res/drawable/btn_citic_commit_background.xml
  46. 0 10
      app/src/main/res/drawable/gx_bg_credit_card_white_corner.xml
  47. 0 10
      app/src/main/res/drawable/gx_bg_credit_card_white_corner1.xml
  48. 0 10
      app/src/main/res/drawable/gx_bg_dialog_white_with_coner.xml
  49. 0 10
      app/src/main/res/drawable/gx_bg_line.xml
  50. 0 16
      app/src/main/res/drawable/gx_btn_credit_card_comfirm.xml
  51. 0 12
      app/src/main/res/drawable/gx_credit_card_btn_gradient_blue.xml
  52. 0 20
      app/src/main/res/drawable/gx_credit_card_radiobtn.xml
  53. 0 22
      app/src/main/res/drawable/gx_s_bg_credit_card_step_cycle.xml
  54. 0 10
      app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_corner_left.xml
  55. 0 10
      app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_corner_right.xml
  56. 0 6
      app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_no_corner.xml
  57. 0 22
      app/src/main/res/drawable/gx_s_bg_credit_card_step_line.xml
  58. 0 38
      app/src/main/res/drawable/gx_s_credit_card_card_type_btn.xml
  59. 0 8
      app/src/main/res/drawable/selector_drawable_citic_in.xml
  60. 0 8
      app/src/main/res/drawable/selector_drawable_citic_out.xml
  61. 0 9
      app/src/main/res/drawable/shape_citic_tab_in.xml
  62. 0 6
      app/src/main/res/drawable/shape_citic_tab_in_white.xml
  63. 0 9
      app/src/main/res/drawable/shape_citic_tab_out.xml
  64. 0 6
      app/src/main/res/drawable/shape_citic_tab_out_white.xml
  65. 0 82
      app/src/main/res/layout/activity_apply_for_credit_card.xml
  66. 0 31
      app/src/main/res/layout/activity_citic_bank_other_info.xml
  67. 0 26
      app/src/main/res/layout/activity_citic_bank_other_info_tab.xml
  68. 0 15
      app/src/main/res/layout/activity_min_sheng_credit.xml
  69. 0 10
      app/src/main/res/layout/activity_test.xml
  70. 0 286
      app/src/main/res/layout/activity_zhong_xin_credit.xml
  71. 0 37
      app/src/main/res/layout/dialog_credit_card_agreement.xml
  72. 0 43
      app/src/main/res/layout/dialog_credit_card_comfirm.xml
  73. 0 160
      app/src/main/res/layout/fragment_apply_for_credit_card_basic_info.xml
  74. 0 301
      app/src/main/res/layout/fragment_apply_for_credit_card_commit.xml
  75. 0 399
      app/src/main/res/layout/fragment_apply_for_credit_card_details.xml
  76. 0 223
      app/src/main/res/layout/fragment_citic_bank_other_info1.xml
  77. 0 310
      app/src/main/res/layout/fragment_citic_third_step.xml
  78. 0 8
      app/src/main/res/layout/fragment_credit_card_display.xml
  79. 0 161
      app/src/main/res/layout/frg_zx_step22.xml
  80. 0 13
      app/src/main/res/layout/spinner_citic_text_item.xml
  81. 0 13
      app/src/main/res/layout/spinner_text_item.xml
  82. 0 46
      app/src/main/res/layout/viewpager_item_credit_card_display.xml
  83. 0 2
      app/src/main/res/values/dd_colors.xml
  84. 0 68
      app/src/main/res/values/gx_strings.xml
  85. 0 193
      app/src/main/res/values/styles.xml

+ 0 - 63
app/src/main/java/com/sheep/groups/creditcard/AgreementCreditCardDialog.java

@@ -1,63 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.WebView;
-import android.widget.ImageView;
-import com.kfzs.libs.dialog.BaseDialogFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import butterknife.BindView;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class AgreementCreditCardDialog extends BaseDialogFragment{
-
-    private static final String HTML_URL = "htmlUrl";
-
-    @BindView(R.id.iv_close)
-    ImageView ivClose;
-    @BindView(R.id.webview)
-    WebView webView;
-
-
-    public static AgreementCreditCardDialog newInstance(String htmlUrl){
-        Bundle bundle = new Bundle();
-        bundle.putString(HTML_URL,htmlUrl);
-        AgreementCreditCardDialog dialog = new AgreementCreditCardDialog();
-        dialog.setArguments(bundle);
-        return dialog;
-    }
-
-
-    @Override
-    public int dialogContentViewLayoutId() {
-        return R.layout.dialog_credit_card_agreement;
-    }
-
-    @Override
-    public void setupContentView() {
-        setCancelable(false);
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dismiss();
-            }
-        });
-
-        Bundle bundle = getArguments();
-        if (bundle != null) {
-            String url = bundle.getString(HTML_URL);
-            if(!TextUtils.isEmpty(url)){
-                webView.loadUrl("file:///android_asset/"+url);
-            }
-        }
-
-    }
-
-
-}

+ 0 - 153
app/src/main/java/com/sheep/groups/creditcard/ApplyForCardTabFragment.java

@@ -1,153 +0,0 @@
-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.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import butterknife.BindView;
-
-/**
- * Created by guoxin on 2018/4/3.
- */
-
-public class ApplyForCardTabFragment extends SupportLoadingFragment implements OnNextStepCallback {
-
-    protected final String TAG = this.getClass().getCanonicalName();
-    public static final int STEP_BASICS = 0;
-    public static final int STEP_DETAILS = 1;
-    public static final int STEP_COMMIT = 2;
-
-    @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) {
-//        openBasic(savedInstanceState);
-        openDetails();
-    }
-
-    @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:
-                lastCommit();
-                break;
-        }
-
-    }
-
-    private void openBasic(Bundle savedInstanceState){
-        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();
-        }
-        basicInfoFragment.init();
-    }
-
-    private void openDetails(){
-        llStep2.setSelected(true);
-
-        detailsFragment = (ApplyForCreditCardDetailsFragment) getChildFragmentManager().findFragmentByTag(ApplyForCreditCardDetailsFragment.class.getSimpleName());
-
-        if(detailsFragment == null){
-            detailsFragment = new ApplyForCreditCardDetailsFragment();
-            detailsFragment.setOnNextStepCallback(this);
-        }
-        detailsFragment.init();
-
-        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);
-        }
-
-        getChildFragmentManager()
-                .beginTransaction()
-                .add(R.id.fl_credit_card_container,commitFragment,ApplyForCreditCardCommitFragment.class.getSimpleName())
-                .addToBackStack(ApplyForCreditCardCommitFragment.class.getSimpleName())
-                .commit();
-    }
-
-    private 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);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if(getUserVisibleHint()){
-            UMConfigUtils.onVisibilityChangedToUser(true, false,TAG);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if(getUserVisibleHint()){
-            UMConfigUtils.onVisibilityChangedToUser(false, false,TAG);
-        }
-    }
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-
-        if(isResumed()){
-            UMConfigUtils.onVisibilityChangedToUser(isVisibleToUser,true,TAG);
-        }
-    }
-}

+ 0 - 135
app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardActivity.java

@@ -1,135 +0,0 @@
-//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();
-//    }
-//}

+ 0 - 458
app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardBasicInfoFragment.java

@@ -1,458 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.kfzs.libs.DaggerFragment;
-import com.kfzs.libs.IDaggerMvp;
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-import com.kfzs.libs.widget.CompleteCommitEditText;
-import com.kfzs.libs.widget.TimeEditText;
-import com.kfzs.libs.widget.toast.ToastView;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implements CreditCardConfirmDialog.OnComfirmCallback,BasicInfoContact.View {
-
-    public static final String TAG = "BasicInfoPresenter";
-
-    @Inject BasicInfoPresenter presenter;
-
-    @BindView(R.id.tv_agreement)
-    TextView tvAgreement;
-    @BindView(R.id.btn_next)
-    TextView btnNext;
-    @BindView(R.id.btn_card_normal)
-    Button btnCardNormal;
-    @BindView(R.id.btn_card_gold)
-    Button btnCardGold;
-    //
-    @BindView(R.id.tv_dynamic)
-    TextView tvDynamic;
-    //et
-    @BindView(R.id.et_name)
-    CompleteCommitEditText etName;
-    @BindView(R.id.et_mobile)
-    TimeEditText etMobile;
-    @BindView(R.id.et_id_no)
-    TimeEditText etIdNo;
-    @BindView(R.id.et_dynamic)
-    CompleteCommitEditText etDynamic;
-
-    OnNextStepCallback onNextStepCallback;
-    private CreditCardDisplayFragment normalCardDisplayFragment;
-    private CreditCardDisplayFragment goldCardDisplayFragment;
-    private int curType = CreditCardDisplayFragment.CARD_TYPE_GOLD;
-    private CountDownUtil countDownUtil;
-
-//    @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
-    public void setupDaggerComponent() {
-
-        DaggerBasicInfoComponent
-                .builder()
-                .httpComponent(SheepApp.getInstance().getHttpComponent())
-                .build()
-                .inject(this);
-    }
-
-    public void clearAllDatas(){
-        etName.setText("");
-        etMobile.setText("");
-        etIdNo.setText("");
-        etDynamic.setText("");
-
-        btnCardNormal.performClick();
-        if(normalCardDisplayFragment != null){
-            if(normalCardDisplayFragment.viewPager != null){
-                normalCardDisplayFragment.viewPager.setCurrentItem(0);
-            }
-        }
-        if(countDownUtil != null){
-            countDownUtil.reset();
-        }
-        CreditCardInfosManager.getInstance().clearAllDatas();
-    }
-
-    @Override
-    public IPresenter currentPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public IView currentIView() {
-        return this;
-    }
-
-    @Override
-    public int layoutResId() {
-        return R.layout.fragment_apply_for_credit_card_basic_info;
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-        test();
-        if(normalCardDisplayFragment == null){
-            normalCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_NORMAL);
-        }
-
-        if(goldCardDisplayFragment == null){
-            goldCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_GOLD);
-        }
-
-        btnCardGold.performClick();
-
-        SpannableStringBuilder builder = new SpannableStringBuilder();
-        builder.append("点击\"下一步\"意味着您已阅读、知晓并同意遵守中国民生银行信用卡");
-        //申请须知
-        createAgreement(builder,"《申请须知》","agreement_application_guide.html","、");
-        //领用合约
-        createAgreement(builder,"《领用合约》","agreement_recipients_contract.html","、");
-        //申请人声明
-        createAgreement(builder,"《申请人声明》","agreement_declaration_applicant.html","、");
-        //芝麻信用协议
-        createAgreement(builder,"《芝麻信用协议》","agreement_sesame_credit.html","及其他相关申请材料");
-        //
-        tvAgreement.setText(builder);
-        tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());//加上这句话,点击才有效果
-
-
-
-        etName.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData("b_name",text,getCardId());
-            }
-        });
-
-        etMobile.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData("b_mobile",text,getCardId());
-            }
-        });
-
-        etIdNo.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData("b_card",text,getCardId());
-            }
-        });
-
-        etDynamic.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData("b_sms",text,getCardId());
-            }
-        });
-
-        tvDynamic.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                sendDynamic();
-            }
-        });
-
-
-
-
-
-        Log.e(TAG, "setupViews: "+getCardId() );
-        //页面进入时统计
-        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())){
-            Toast.makeText(activity,"请填写姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etMobile.getText().toString())){
-            Toast.makeText(activity,"请填写手机号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(etMobile.getText().toString().length() != 11){
-            Toast.makeText(activity,"手机号位数不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etIdNo.getText().toString())){
-            Toast.makeText(activity,"请填写身份证号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(etIdNo.getText().toString().length() != 18){
-            Toast.makeText(activity,"身份证号位数不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        Map<String,String> map = new HashMap<>();
-        map.put("name",etName.getText().toString());
-        map.put("mobile",etMobile.getText().toString());
-        map.put("id_card",etIdNo.getText().toString());
-        map.put("card_id",getCardId());
-        Log.e(TAG, "sendDynamic: "+map.toString());
-        presenter.getDynamic(map);
-        //倒计时60000ms
-        //不同状态字体颜色
-        countDownUtil = new CountDownUtil(tvDynamic)
-                .setCountDownMillis(60_000L)//倒计时60000ms
-                .setCountDownColor(R.color.credit_blue_color,R.color.credit_blue_color)//不同状态字体颜色
-                .start();
-    }
-
-    private String getCardId(){
-        //默认
-        String cardId = String.valueOf(CreditCardDisplayFragment.CARD_GOLD_PAINT);
-        if(CreditCardDisplayFragment.CARD_TYPE_NORMAL == curType){
-            cardId =  String.valueOf(normalCardDisplayFragment.getCardDetailType());
-        }
-        else if(CreditCardDisplayFragment.CARD_TYPE_GOLD == curType){
-            cardId =  String.valueOf(goldCardDisplayFragment.getCardDetailType());
-        }
-        Log.e(TAG, "getCardId: "+cardId );
-        return cardId;
-    }
-
-    private void createAgreement(SpannableStringBuilder strBuilder, String content, String linkedUrl, String sufixStr){
-        AgreementSpannableString agreement = new AgreementSpannableString(content);
-        agreement.initAgreementStyle((AppCompatActivity) activity,linkedUrl);
-        strBuilder.append(agreement);
-        strBuilder.append(sufixStr);
-    }
-
-    @Override
-    public void onConfirm() {
-
-
-        if(TextUtils.isEmpty(presenter.getTicket())){
-            Toast.makeText(activity,"请先获取验证码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-
-        Map<String,String> map = new HashMap<>();
-
-        map.put("name",etName.getText().toString());
-        map.put("mobile",etMobile.getText().toString());
-        map.put("id_card",etIdNo.getText().toString());
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("card_id",getCardId());
-        map.put("code",etDynamic.getText().toString());
-        map.put("ticket",presenter.getTicket());
-
-
-        presenter.commitBasic(map);
-
-    }
-
-    @Override
-    public void goNext(){
-        Log.e(TAG, "goNext:fragment " );
-        //记录信息
-        CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
-        manager.card_id = getCardId();
-        manager.b_name = etName.getText().toString();
-        manager.b_mobile = etMobile.getText().toString();
-        manager.b_card = etIdNo.getText().toString();
-        manager.b_sms = etDynamic.getText().toString();
-        manager.ticket = presenter.getTicket();
-
-        manager.phoneNum1 = etMobile.getTotalFocusTime();
-        manager.sfz1 = etIdNo.getTotalFocusTime();
-        manager.firstSumLong = System.currentTimeMillis()-startTime;
-
-        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_BASICS);
-    }
-
-    @Override
-    public boolean isViewActive() {
-        return isAdded();
-    }
-
-    @Override
-    public void showProgress(String msg) {
-        Toast.makeText(activity,msg,Toast.LENGTH_SHORT).show();
-    }
-
-
-    public static class AgreementSpannableString extends SpannableString {
-
-        public AgreementSpannableString(CharSequence source) {
-            super(source);
-        }
-
-        public void initAgreementStyle(AppCompatActivity context, String linkedUrl){
-            setSpan(new Clickable(context,linkedUrl),0,length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-    }
-
-    @OnClick({R.id.btn_next,R.id.btn_card_normal,R.id.btn_card_gold})
-    public void btnClick(View view){
-        switch (view.getId()){
-            case R.id.btn_next:
-                clickBtnNext();
-//                goNext();
-                break;
-            case R.id.btn_card_normal:
-                selectNormalCard();
-                break;
-            case R.id.btn_card_gold:
-                selectGoldCard();
-                break;
-        }
-
-    }
-
-    private void clickBtnNext(){
-        if(TextUtils.isEmpty(etName.getText().toString())){
-            Toast.makeText(activity,"请填写姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etMobile.getText().toString())){
-            Toast.makeText(activity,"请填写手机号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(!RegexUtils.isMobileSimple(etMobile.getText().toString())){
-            Toast.makeText(activity,"手机号不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etIdNo.getText().toString())){
-            Toast.makeText(activity,"请填写身份证号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(!RegexUtils.isIDCard18(etIdNo.getText().toString())){
-            Toast.makeText(activity,"身份证号不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etDynamic.getText().toString())){
-            Toast.makeText(activity,"请填验证码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        showConfirmDialog();
-    }
-
-    private void selectNormalCard(){
-        btnCardNormal.setSelected(true);
-        btnCardGold.setSelected(false);
-        curType = CreditCardDisplayFragment.CARD_TYPE_NORMAL;
-        getChildFragmentManager()
-                .beginTransaction()
-                .replace(R.id.fl_credit_card_display_container,normalCardDisplayFragment)
-                .commit();
-    }
-    private void selectGoldCard(){
-        btnCardNormal.setSelected(false);
-        btnCardGold.setSelected(true);
-        curType = CreditCardDisplayFragment.CARD_TYPE_GOLD;
-        Log.e(TAG, "selectGoldCard: "+curType );
-        getChildFragmentManager()
-                .beginTransaction()
-                .replace(R.id.fl_credit_card_display_container,goldCardDisplayFragment)
-                .commit();
-    }
-
-    private void showConfirmDialog(){
-        new CreditCardConfirmDialog()
-                .setOnComfirmCallback(this)
-                .show(getChildFragmentManager(),CreditCardConfirmDialog.class.getSimpleName());
-    }
-
-
-
-    public static class Clickable extends ClickableSpan {
-
-        WeakReference<AppCompatActivity> activityWeakReference;
-        String linkedUrl;
-
-        public Clickable(AppCompatActivity activity, String linkedUrl){
-            activityWeakReference = new WeakReference<AppCompatActivity>(activity);
-            this.linkedUrl = linkedUrl;
-        }
-
-        @Override
-        public void onClick(View widget) {
-            AppCompatActivity activity = activityWeakReference.get();
-            if(activity != null){
-                AgreementCreditCardDialog.newInstance(linkedUrl)
-                        .show(activity.getSupportFragmentManager(),AgreementCreditCardDialog.class.getSimpleName());
-            }
-        }
-
-        @Override
-        public void updateDrawState(TextPaint ds) {
-            ds.setColor(Color.parseColor("#0089ee"));
-            ds.setUnderlineText(false);    //去除超链接的下划线
-        }
-    }
-    private void test(){
-        if(BuildConfig.DEBUG){
-            etName.setText("曾杰斌");
-            etMobile.setText("13880742867");
-            etIdNo.setText("513822198806077711");
-        }
-    }
-
-
-}

+ 0 - 219
app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardCommitFragment.java

@@ -1,219 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import com.kfzs.libs.DaggerFragment;
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-import com.kfzs.libs.widget.CompleteCommitEditText;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ApplyForCreditCardCommitFragment extends DaggerFragment implements ModifyContact.View {
-
-
-    @BindView(R.id.edit_card_time)
-    CompleteCommitEditText editCardTime;
-    @BindView(R.id.edit_address_origin)
-    CompleteCommitEditText editAddressOrigin;
-    @BindView(R.id.edit_address_now)
-    CompleteCommitEditText editAddressNow;
-    @BindView(R.id.edit_email)
-    CompleteCommitEditText editEmail;
-    @BindView(R.id.edit_edu_info)
-    CompleteCommitEditText editEduInfo;
-    @BindView(R.id.edit_company_name)
-    CompleteCommitEditText editCompanyName;
-    @BindView(R.id.edit_company_city)
-    CompleteCommitEditText editCompanyCity;
-    @BindView(R.id.edit_company_address)
-    CompleteCommitEditText editCompanyAddress;
-    @BindView(R.id.edit_company_tel)
-    CompleteCommitEditText editCompanyTel;
-    @BindView(R.id.edit_work_life)
-    CompleteCommitEditText editWorkLife;
-    @BindView(R.id.edit_family_name)
-    CompleteCommitEditText editFamilyName;
-    @BindView(R.id.edit_relationship)
-    CompleteCommitEditText editRelationship;
-    @BindView(R.id.edit_family_tel)
-    CompleteCommitEditText editFamilyTel;
-    @BindView(R.id.edit_relationship_other)
-    CompleteCommitEditText editRelationshipOther;
-    @BindView(R.id.btn_commit_info)
-    TextView btnCommitInfo;
-    @BindView(R.id.btn_modify_infos)
-    TextView btnModifyInfos;
-    @BindView(R.id.cbx_marry_yes)
-    CheckBox cbxMarryYes;
-    @BindView(R.id.cbx_marry_no)
-    CheckBox cbxMarryNo;
-    @BindView(R.id.cbx_expire_long)
-    CheckBox cbxExpireLong;
-
-
-    @Inject
-    ModifyPresenter presenter;
-    private Unbinder unbinder;
-
-    private OnNextStepCallback onNextStepCallback;
-
-//    @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
-    public void setupDaggerComponent() {
-        DaggerModifyComponent.builder().httpComponent(SheepApp.getInstance().getHttpComponent()).build().inject(this);
-    }
-
-    @Override
-    public IPresenter currentPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public IView currentIView() {
-        return this;
-    }
-
-    @Override
-    public int layoutResId() {
-        return R.layout.fragment_apply_for_credit_card_commit;
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-
-        CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
-        //身份证日期
-        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);
-        //婚姻
-        String marray = CreditCardInfosManager.getInstance().p_marray;
-        if (TextUtils.equals(CreditCardInfosManager.MARRY_Y, marray)) {
-            cbxMarryYes.setChecked(true);
-            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);
-        //单位电话
-        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);
-
-        //亲属
-        editFamilyName.setText(CreditCardInfosManager.getInstance().c_d_name);
-        editRelationship.setText(CreditCardInfosManager.getInstance().c_d_relation);
-        editFamilyTel.setText(CreditCardInfosManager.getInstance().c_d_mobile);
-
-        StringBuilder sb = new StringBuilder(CreditCardInfosManager.getInstance().c_o_name);
-        sb.append(" ");
-        sb.append(CreditCardInfosManager.getInstance().c_o_relation);
-        sb.append(" ");
-        sb.append(CreditCardInfosManager.getInstance().c_o_mobile);
-        editRelationshipOther.setText(sb.toString());
-
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        return rootView;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @OnClick({R.id.btn_commit_info})
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.btn_commit_info:
-                goNext();
-                break;
-        }
-    }
-
-    @Override
-    public boolean isViewActive() {
-        return isAdded();
-    }
-
-    @Override
-    public void showProgress(String msg) {
-
-    }
-
-    @Override
-    public void goNext() {
-        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_COMMIT);
-    }
-
-//    OnLastCommitCallback onLastCommitCallback;
-//
-//    public void setOnLastCommitCallback(OnLastCommitCallback onLastCommitCallback) {
-//        this.onLastCommitCallback = onLastCommitCallback;
-//    }
-//
-//    public interface OnLastCommitCallback{
-//        void lastCommit();
-//    }
-}

+ 0 - 666
app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardDetailsFragment.java

@@ -1,666 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.app.DatePickerDialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSpinner;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-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;
-import android.widget.Toast;
-
-import com.kfzs.duanduan.react.ReactUtil;
-import com.kfzs.libs.DaggerFragment;
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-import com.kfzs.libs.widget.CompleteCommitEditText;
-import com.kfzs.libs.widget.TimeEditText;
-import com.kfzs.libs.widget.alpha.AlphaButton;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements DetailsContact.View{
-
-
-    @BindView(R.id.et_city)
-    CompleteCommitEditText etCity;
-    @BindView(R.id.et_address)
-    CompleteCommitEditText etAddress;
-    @BindView(R.id.et_email)
-    CompleteCommitEditText etEmail;
-    @BindView(R.id.et_education)
-    CompleteCommitEditText etEducation;
-    @BindView(R.id.et_company_name)
-    TimeEditText etCompanyName;
-    @BindView(R.id.et_company_city)
-    CompleteCommitEditText etCompanyCity;
-    @BindView(R.id.et_company_address)
-    TimeEditText etCompanyAddress;
-    @BindView(R.id.et_company_phone_no)
-    TimeEditText etCompanyPhoneNo;
-    @BindView(R.id.et_company_phone_q)
-    TimeEditText etCompanyPhoneQ;
-    @BindView(R.id.et_company_phone_f)
-    TimeEditText etCompanyPhoneF;
-    @BindView(R.id.et_work_year)
-    CompleteCommitEditText etWorkYear;
-    @BindView(R.id.et_ir_name)
-    CompleteCommitEditText etIRName;
-    @BindView(R.id.et_ir_mobile)
-    CompleteCommitEditText etIRMobile;
-    @BindView(R.id.et_other_r_name)
-    CompleteCommitEditText etOtherName;
-    @BindView(R.id.et_other_r_mobile)
-    CompleteCommitEditText etOtherMobile;
-    @BindView(R.id.tv_id_no_expire)
-    TextView tvIdCardExpire;
-    @BindView(R.id.et_car_no)
-    CompleteCommitEditText etCarNo;
-    @BindView(R.id.et_home_q)
-    CompleteCommitEditText etHomeQ;
-    @BindView(R.id.et_home_phone)
-    CompleteCommitEditText etHomePhone;
-    @BindView(R.id.et_qq)
-    CompleteCommitEditText etQQ;
-
-    @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)
-    AppCompatSpinner spImmediateRelationship;
-    @BindView(R.id.sp_relationship_other)
-    AppCompatSpinner spOtherRelationship;
-    @BindView(R.id.cb_expire)
-    CheckBox cbExpire;
-
-    @BindView(R.id.btn_next)
-    AlphaButton btnNext;
-
-    @Inject
-    DetailsPresenter presenter;
-    OnNextStepCallback onNextStepCallback;
-    private ArrayAdapter<CharSequence> adapterImmediateRelatives;
-    private ArrayAdapter<CharSequence> adapterOther;
-
-//    @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
-    public void setupDaggerComponent() {
-        DaggerDetailsComponent.builder().httpComponent(SheepApp.getInstance().getHttpComponent()).build().inject(this);
-    }
-
-    @Override
-    public IPresenter currentPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public IView currentIView() {
-        return this;
-    }
-
-    @Override
-    public int layoutResId() {
-        return R.layout.fragment_apply_for_credit_card_details;
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-        test();
-
-        adapterImmediateRelatives = ArrayAdapter.createFromResource(activity, R.array.credit_card_relationship_immediate_relatives_type, R.layout.spinner_text_item);
-        spImmediateRelationship.setAdapter(adapterImmediateRelatives);
-
-        adapterOther = ArrayAdapter.createFromResource(activity, R.array.credit_card_relationship_other_type, R.layout.spinner_text_item);
-        spOtherRelationship.setAdapter(adapterOther);
-
-        //
-        setOnCompleteEdit(etCity,"p_city");
-        setOnCompleteEdit(etAddress,"p_address");
-        setOnCompleteEdit(etEmail,"p_email");
-        rbY.setTag(CreditCardInfosManager.MARRY_Y);
-        rbN.setTag(CreditCardInfosManager.MARRY_N);
-        rbO.setTag(CreditCardInfosManager.MARRY_O);
-        //p_marray
-        rgMarray.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                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;
-            }
-        });
-//        -1:请选择教育程度 6:博士及以上 5:硕士 4:本科 3:大专 2:高中/中专 1:初中及以下
-        List<String> stringList = new ArrayList<>();
-        stringList.add("请选择教育程度");
-        stringList.add("博士及以上");
-        stringList.add("硕士");
-        stringList.add("本科");
-        stringList.add("大专");
-        stringList.add("高中/中专");
-        stringList.add("初中及以下");
-        final List<String> idList = new ArrayList<>();
-        idList.add("-1");
-        idList.add("6");
-        idList.add("5");
-        idList.add("4");
-        idList.add("3");
-        idList.add("2");
-        idList.add("1");
-        ArrayAdapter arrayAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1, stringList);
-        etEducation.setAdapter(arrayAdapter);
-        etEducation.setFocusable(false);
-        etEducation.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                etEducation.showDropDown();
-            }
-        });
-        etEducation.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                presenter.commitFormData("p_edu",idList.get(position),CreditCardInfosManager.getInstance().card_id);
-            }
-        });
-
-//        setOnCompleteEdit(etEducation,"p_edu");
-        setOnCompleteEdit(etCompanyName,"w_name");
-        setOnCompleteEdit(etCompanyCity,"w_city");
-        setOnCompleteEdit(etCompanyAddress,"w_address");
-        setOnCompleteEditDouble(etCompanyPhoneNo,etCompanyPhoneQ,"w_tel");//要取得两个值,所以单独设置
-//        setOnCompleteEdit(etCompanyPhoneQ,"p_city");
-        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
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String value = (String) adapterImmediateRelatives.getItem(position);
-                CreditCardInfosManager.getInstance().c_d_relation = value;
-                presenter.commitFormData("c_d_relation",value,CreditCardInfosManager.getInstance().card_id);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-        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 =  adapterOther.getItem(position).toString();
-                CreditCardInfosManager.getInstance().c_d_relation = value;
-                presenter.commitFormData("c_o_relation",value,CreditCardInfosManager.getInstance().card_id);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
-        setOnCompleteEdit(etOtherName,"c_o_name");
-        setOnCompleteEdit(etOtherMobile,"c_o_mobile");
-        tvIdCardExpire.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //显示日历,key为o_id_expire
-                showDatePicker();
-            }
-        });
-        //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){
-                    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();
-
-            }
-        });
-
-
-
-
-        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() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                CreditCardInfosManager.getInstance().is_agree = isChecked;
-                presenter.commitFormData("is_agree",String.valueOf(isChecked),CreditCardInfosManager.getInstance().card_id);
-            }
-        });
-
-        //页面进入时统计
-        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(){
-        if(BuildConfig.DEBUG){
-            etCompanyName.setText("成都云端助手有限公司");
-            etCompanyAddress.setText("成都市高新区天府二街蜀都中心");
-        }
-
-//        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");
-//        cbExpire.setChecked(true);
-////        tvIdCardExpire.setText("2087/12/11");
-////        etCarNo.setText("川A4554DH");
-////        etHomeQ.setText("028");
-////        etHomePhone.setText("84074663");
-////        etQQ.setText("506578835");
-//        cbAgreement.setChecked(true);
-
-    }
-
-    private void showDatePicker(){
-        // 获得日历对象
-        Calendar c = Calendar.getInstance();
-        // 获取当前年份
-        int year = c.get(Calendar.YEAR);
-        // 获取当前月份
-        int monthOfYear = c.get(Calendar.MONTH);
-        // 获取当前月份的天数
-        int dayOfMonth = c.get(Calendar.DAY_OF_MONTH);
-
-        new DatePickerDialog(activity, new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
-                String expire = year + "/" + month + "/" + dayOfMonth;
-                tvIdCardExpire.setText(expire);
-                CreditCardInfosManager.getInstance().o_id_expire = expire;
-                presenter.commitFormData("o_id_expire",expire,CreditCardInfosManager.getInstance().card_id);
-            }
-        },year,monthOfYear,dayOfMonth).show();
-
-    }
-
-    private void setOnCompleteEdit(final CompleteCommitEditText et, final String key){
-        et.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData(key,et.getText().toString(),CreditCardInfosManager.getInstance().card_id);
-            }
-        });
-    }
-
-    private void setOnCompleteEditDouble(final CompleteCommitEditText et,final CompleteCommitEditText etQ, final String key){
-        et.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData(key,etQ.getText().toString()+et.getText().toString(),CreditCardInfosManager.getInstance().card_id);
-            }
-        });
-    }
-
-
-
-    @OnClick(R.id.btn_next)
-    public void btnClick(View view){
-
-        if(TextUtils.isEmpty(etCity.getText().toString())){
-            Toast.makeText(activity,"请填写住宅城市",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etAddress.getText().toString())){
-            Toast.makeText(activity,"请填写住宅地址",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etEmail.getText().toString())){
-            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;
-        }
-        if(TextUtils.isEmpty(etEducation.getText().toString())){
-            Toast.makeText(activity,"请填写教育程度",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etCompanyName.getText().toString())){
-            Toast.makeText(activity,"请填写单位名称",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etCompanyAddress.getText().toString())){
-            Toast.makeText(activity,"请填写单位地址",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etCompanyPhoneNo.getText().toString()) || TextUtils.isEmpty(etCompanyPhoneQ.getText().toString())){
-            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;
-        }
-        try{
-            int workY = Integer.parseInt(etWorkYear.getText().toString());
-            if(50 <= workY){
-                Toast.makeText(activity,"工作年限不能大于50",Toast.LENGTH_SHORT).show();
-                return;
-            }
-        }
-        catch (Exception e){
-
-        }
-
-
-        if(TextUtils.isEmpty(etIRName.getText().toString())){
-            Toast.makeText(activity,"请填写直属亲属姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etIRMobile.getText().toString())){
-            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;
-        }
-
-        if(TextUtils.isEmpty(etOtherName.getText().toString())){
-            Toast.makeText(activity,"请填写其他联系人姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etOtherMobile.getText().toString())){
-            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;
-        }
-
-        //有效期
-        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;
-//        }
-
-        //不是必填的
-//        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<>();
-        String p_city = etCity.getText().toString();
-        map.put("p_city",p_city);
-        manager.p_city = p_city;
-
-        String p_address = etAddress.getText().toString();
-        map.put("p_address",p_address);
-        manager.p_address = p_address;
-
-        String p_email = etEmail.getText().toString();
-        map.put("p_email",p_email);
-        manager.p_email = p_email;
-
-        String p_marray = CreditCardInfosManager.getInstance().p_marray;
-        map.put("p_marray",p_marray);
-        manager.p_marray = p_marray;
-
-        String p_edu = etEducation.getText().toString();
-        map.put("p_edu",p_edu);
-        manager.p_edu =p_edu;
-
-        String w_name = etCompanyName.getText().toString();
-        map.put("w_name",w_name);
-        manager.w_name = w_name;
-
-        String w_city = etCompanyCity.getText().toString();
-        map.put("w_city",w_city);
-        manager.w_city = w_city;
-
-        String w_address = etCompanyAddress.getText().toString();
-        map.put("w_address",w_address);
-        manager.w_address = w_address;
-
-        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_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;
-
-        String c_d_name = etIRName.getText().toString();
-        map.put("c_d_name",c_d_name);
-        manager.c_d_name = c_d_name;
-
-        String c_d_mobile = etIRMobile.getText().toString();
-        map.put("c_d_mobile",c_d_mobile);
-        manager.c_d_mobile = c_d_mobile;
-
-        map.put("c_d_relation",CreditCardInfosManager.getInstance().c_d_relation);
-
-        String c_o_name = etOtherName.getText().toString();
-        map.put("c_o_name",c_o_name);
-        manager.c_o_name =c_o_name;
-
-        String c_o_mobile = etOtherMobile.getText().toString();
-        map.put("c_o_mobile",c_o_mobile);
-        manager.c_o_mobile = c_o_mobile;
-
-        map.put("c_o_relation",CreditCardInfosManager.getInstance().c_o_relation);
-
-        if(cbExpire.isChecked()){
-            map.put("o_id_expire",CreditCardInfosManager.getInstance().o_id_expire);
-        }
-        else {
-            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();
-        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();
-        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();
-        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();
-        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");
-
-        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);
-    }
-
-
-    @Override
-    public boolean isViewActive() {
-        return isAdded();
-    }
-
-    @Override
-    public void showProgress(String msg) {
-        Toast.makeText(activity,msg,Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public void goNext() {
-        //记录信息
-        CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
-        manager.comDetail = etCompanyAddress.getTotalFocusTime();
-        manager.companyName = etCompanyName.getTotalFocusTime();
-        manager.comDetail = etCompanyPhoneNo.getTotalFocusTime()+etCompanyPhoneF.getTotalFocusTime()+etCompanyPhoneQ.getTotalFocusTime();
-        manager.secondSumLong = System.currentTimeMillis() - startTime;
-
-//        public float comDetail;//停留在单位地址上的时间
-//        public float comTel;//停留在单位电话上的时间
-//        public float companyName;//停留在公司名字上的时间
-//        public float secondSumLong;//停留在页面2上的时间
-        onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_DETAILS);
-    }
-}

+ 0 - 17
app/src/main/java/com/sheep/groups/creditcard/BasicInfoComponent.java

@@ -1,17 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import com.kfzs.libs.di.http.HttpComponent;
-import com.kfzs.libs.di.http.HttpScope;
-import com.sheep.gamegroup.di.components.NetComponent;
-import com.sheep.gamegroup.di.scopes.UserScope;
-
-import dagger.Component;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-@HttpScope
-@Component(dependencies = HttpComponent.class)
-public interface BasicInfoComponent {
-    void inject(ApplyForCreditCardBasicInfoFragment fragment);
-}

+ 0 - 28
app/src/main/java/com/sheep/groups/creditcard/BasicInfoContact.java

@@ -1,28 +0,0 @@
-package com.sheep.groups.creditcard;
-
-
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-
-import java.util.Map;
-
-/**
- * Created by guoxin on 2018/3/29.
- */
-
- interface BasicInfoContact {
-
-    interface View extends IView {
-        void showProgress(String msg);
-        void goNext();
-    }
-
-    interface Presenter extends IPresenter {
-        void loadData();
-        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);
-    }
-
-}

+ 0 - 227
app/src/main/java/com/sheep/groups/creditcard/BasicInfoPresenter.java

@@ -1,227 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.util.Log;
-
-import com.kfzs.libs.IView;
-import com.kfzs.libs.convert.HttpObservableTransformer;
-import com.kfzs.libs.di.http.HttpService;
-import com.sheep.gamegroup.model.api.ApiService;
-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;
-
-import javax.inject.Inject;
-
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class BasicInfoPresenter implements BasicInfoContact.Presenter {
-
-    public static final String TAG = "BasicInfoPresenter";
-
-    HttpService httpService;
-    BasicInfoContact.View view;
-
-    private String ticket;
-
-    public String getTicket() {
-        return ticket;
-    }
-
-    @Inject
-    public BasicInfoPresenter(HttpService service){
-        this.httpService = service;
-    }
-
-    @Override
-    public void attachedView(IView view) {
-        this.view = (BasicInfoContact.View) view;
-    }
-
-    @Override
-    public void detachedView() {
-        this.view = null;
-    }
-
-    @Override
-    public boolean isContactViewActive() {
-        if (view != null) {
-            return view.isViewActive();
-        }
-        return false;
-    }
-
-
-    @Override
-    public void loadData() {
-        Map<String,String> map = new HashMap<>();
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("key","b_mobile");
-        map.put("value","18608003614");
-        map.put("card_id","159");
-        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 );
-                    }
-                });
-
-    }
-
-    @Override
-    public void commitFormData(String key, String value, String cardId) {
-        Map<String,String> map = new HashMap<>();
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("key",key);
-        map.put("value",value);
-        map.put("card_id",cardId);
-        Log.e(TAG, "commitFormData: "+map.toString() );
-
-        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 );
-                    }
-                });
-    }
-
-    @Override
-    public void commitBasic(Map<String, String> map) {
-        Log.e(TAG, "commitBasic: "+map.toString() );
-        httpService
-                .commitCreditCardBasic(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:commitBasic: "+e.getMessage() );
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext-commitBasic: "+s );
-
-                        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 getDynamic(Map<String, String> map) {
-        httpService
-                .getCreditCardDynamic(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() );
-                        view.showProgress(e.getMessage());
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext: "+s );
-                        //保存ticket
-                        try {
-                            JSONObject object = new JSONObject(s);
-                            if(object.getBoolean("success")){
-                                ticket = object.getJSONObject("data").getString("ticket");
-                                view.showProgress(object.getString("验证码发送成功"));
-                            }
-                            else {
-                                view.showProgress(object.getString("errors"));
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-                    }
-                });
-    }
-
-    @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 );
-                    }
-                });
-    }
-}

+ 0 - 109
app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoActivity.java

@@ -1,109 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentTabHost;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TabHost;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.groups.creditcard.fragment.CiticStepThreeFragment;
-import com.sheep.groups.creditcard.zx.ZhongXinStep22Fragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-/**
- * Created by realicing on 2018/4/4.
- * realicing@sina.com
- */
-public class CITICBankOtherInfoActivity extends BaseActivity {
-
-    @BindView(R.id.txt_baseactivity_title)
-    TextView txtBaseactivityTitle;
-    @BindView(R.id.img_baseactivity_title)
-    ImageView imgBaseactivityTitle;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_citic_bank_other_info;
-    }
-
-    @Override
-    public void initView() {
-        initFragmentTabHost();
-
-    }
-
-    @Override
-    public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-
-    }
-
-    private FragmentTabHost mFragmentTabHost;
-
-    public FragmentTabHost getmFragmentTabHost() {
-        return mFragmentTabHost;
-    }
-
-    private Class tabFragmentContentArray[] = {CITICBankOtherInfoFragment1.class, ZhongXinStep22Fragment.class, CiticStepThreeFragment.class};
-
-    /**
-     * 初始化的FragmentTabHost
-     */
-    private void initFragmentTabHost() {
-        mFragmentTabHost = findViewById(android.R.id.tabhost);
-        mFragmentTabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent);
-        mFragmentTabHost.getTabWidget().setDividerDrawable(android.R.color.transparent);
-        for (int index = 0; index < tabFragmentContentArray.length; index++) {
-            View view = LayoutInflater.from(this).inflate(R.layout.activity_citic_bank_other_info_tab, null);
-            String lable = String.format(Locale.CHINA, "%d", index + 1);
-            ViewFindUtils.find(view, R.id.activity_citic_bank_other_info_tab_tv, TextView.class).setText(lable);
-
-            TabHost.TabSpec tabSpec = mFragmentTabHost.newTabSpec(lable).setIndicator(view);
-            mFragmentTabHost.addTab(tabSpec, tabFragmentContentArray[index], null);
-        }
-        mFragmentTabHost.getTabWidget().setEnabled(false);
-        gotoNext(0);
-    }
-
-
-    public void gotoNext(int tab){
-        if(tab >= 0 && tab < 3) {
-//            mFragmentTabHost.getTabWidget().setCurrentTab(tab);
-            mFragmentTabHost.setCurrentTab(tab);
-        }
-        if(tab == 0){
-            txtBaseactivityTitle.setText("联系方式");
-        }else if(tab == 1){
-            txtBaseactivityTitle.setText("公司信息及办卡方式");
-        }else if(tab == 2){
-            txtBaseactivityTitle.setText("直系亲属及紧急联系人资料");
-        }
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
-    @OnClick(R.id.img_baseactivity_title)
-    public void onViewClicked() {
-        onBackPressed();
-    }
-}

+ 0 - 175
app/src/main/java/com/sheep/groups/creditcard/CITICBankOtherInfoFragment1.java

@@ -1,175 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.kfzs.libs.di.http.HttpService;
-import com.kfzs.libs.widget.alpha.AlphaButton;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseFragment;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by realicing on 2018/4/4.
- * realicing@sina.com
- */
-public class CITICBankOtherInfoFragment1 extends BaseFragment {
-    @BindView(R.id.citic_province)
-    EditText citicProvince;
-    @BindView(R.id.citic_city)
-    EditText citicCity;
-    @BindView(R.id.citic_area)
-    EditText citicArea;
-    @BindView(R.id.citic_addr_et)
-    EditText citicAddrEt;
-    @BindView(R.id.citic_area_code)
-    EditText citicAreaCode;
-    @BindView(R.id.citic_phone_et)
-    EditText citicPhoneEt;
-    @BindView(R.id.citic_email_et)
-    EditText citicEmailEt;
-    @BindView(R.id.btn_citic_next_step)
-    AlphaButton btnCiticNextStep;
-    Unbinder unbinder;
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.fragment_citic_bank_other_info1;
-    }
-
-    @Override
-    public void onViewCreated() {
-        setFirstRed((TextView) findViewById(R.id.citic_addr_info));
-        setFirstRed((TextView) findViewById(R.id.citic_addr));
-        setFirstRed((TextView) findViewById(R.id.citic_email));
-    }
-
-    /**
-     * 设置第一个字符颜色为红色
-     *
-     * @param textView
-     */
-    public static void setFirstRed(TextView textView) {
-        setFirstRed(textView, textView.getText().toString());
-    }
-
-    /**
-     * 设置第一个字符颜色为红色
-     *
-     * @param textView
-     * @param text
-     */
-    public static void setFirstRed(TextView textView, String text) {
-        SpannableStringBuilder style = new SpannableStringBuilder(text);
-        style.setSpan(new ForegroundColorSpan(0xffD1021E), 0, 1, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
-        textView.setText(style);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        return rootView;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @OnClick(R.id.btn_citic_next_step)
-    public void onViewClicked() {
-        String strProvince = citicProvince.getText().toString();
-        if(TextUtils.isEmpty(strProvince)){
-            showToast("请输入省份");
-            return;
-        }
-        String strCity = citicCity.getText().toString();
-        if(TextUtils.isEmpty(strCity)){
-            showToast("请输入城市");
-            return;
-        }
-        String strArea = citicArea.getText().toString();
-        if(TextUtils.isEmpty(strArea)){
-            showToast("请输入区");
-            return;
-        }
-        String strAddr = citicAddrEt.getText().toString();
-        if(TextUtils.isEmpty(strAddr)){
-            showToast("请输入详细地址");
-            return;
-        }
-        String strAreaCode = citicAreaCode.getText().toString();
-        String strPhone = citicPhoneEt.getText().toString();
-        String strEmail = citicEmailEt.getText().toString();
-        if(TextUtils.isEmpty(strEmail)){
-            showToast("请输入电子邮件");
-            return;
-        }
-
-        //亲属
-        Map<String,String> map = new HashMap<>();
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("province",strProvince);
-        map.put("city",strCity);
-        map.put("district",strArea);
-        map.put("address",strAddr);
-        map.put("tel_1",strAreaCode);
-
-        //紧急联系人
-        map.put("tel_2",strPhone);
-        map.put("email",strEmail);
-
-        HttpService httpService = SheepApp.getInstance().getHttpComponent().getHttpService();
-        httpService.zxContact(map).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
-                    @Override
-                    public void onCompleted() {
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
-
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        /// ??? 提交完成后,去哪儿????
-                        Activity activity = getActivity();
-                        if(activity != null && activity instanceof CITICBankOtherInfoActivity){
-                            ((CITICBankOtherInfoActivity)activity).gotoNext(1);
-                        }
-//                        showToast("数据发送成功");
-                    }
-                });
-
-    }
-
-    private void showToast(String text){
-        Toast.makeText(SheepApp.mContext,text,Toast.LENGTH_SHORT).show();
-    }
-}

+ 0 - 167
app/src/main/java/com/sheep/groups/creditcard/CountDownUtil.java

@@ -1,167 +0,0 @@
-package com.sheep.groups.creditcard;
-
-/**
- * Created by guoxin on 2018/4/3.
- */
-
-import android.os.Handler;
-import android.os.Message;
-import android.support.annotation.ColorRes;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.widget.TextView;
-
-import java.lang.ref.WeakReference;
-
-/**
- * 倒计时工具
- * Created by weijing on 2017-08-22 11:50.
- */
-
-public class CountDownUtil {
-    /**
-     * 开始倒计时code
-     */
-    private final int MSG_WHAT_START = 10_010;
-    /**
-     * 弱引用
-     */
-    private WeakReference<TextView> mWeakReference;
-    /**
-     * 倒计时时间
-     */
-    private long mCountDownMillis = 60_000;
-    /**
-     * 提示文字
-     */
-    private String mHintText = "重新发送";
-
-    /**
-     * 剩余倒计时时间
-     */
-    private long mLastMillis;
-
-    /**
-     * 间隔时间差(两次发送handler)
-     */
-    private long mIntervalMillis = 1_000;
-
-    /**
-     * 可用状态下字体颜色Id
-     */
-    private int usableColorId = android.R.color.holo_blue_light;
-    /**
-     * 不可用状态下字体颜色Id
-     */
-    private int unusableColorId = android.R.color.darker_gray;
-
-
-    private Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            switch (msg.what) {
-                case MSG_WHAT_START:
-                    if (mLastMillis > 0) {
-                        setUsable(false);
-                        mLastMillis -= mIntervalMillis;
-                        if (mWeakReference.get() != null) {
-                            mHandler.sendEmptyMessageDelayed(MSG_WHAT_START, mIntervalMillis);
-                        }
-                    } else {
-                        setUsable(true);
-                    }
-                    break;
-            }
-        }
-    };
-
-    public CountDownUtil(TextView textView) {
-        mWeakReference = new WeakReference<>(textView);
-    }
-
-    public CountDownUtil(TextView textView, long countDownMillis) {
-        mWeakReference = new WeakReference<>(textView);
-        this.mCountDownMillis = countDownMillis;
-    }
-
-    public CountDownUtil setCountDownMillis(long countDownMillis) {
-        this.mCountDownMillis = countDownMillis;
-        return this;
-    }
-
-
-    /**
-     * 设置是否可用
-     *
-     * @param usable
-     */
-    private void setUsable(boolean usable) {
-        TextView mTextView = mWeakReference.get();
-        if (mTextView != null) {
-            if (usable) {
-                //可用
-                if (!mTextView.isClickable()) {
-                    mTextView.setClickable(usable);
-                    mTextView.setTextColor(mTextView.getResources().getColor(usableColorId));
-                    mTextView.setText(mHintText);
-                }
-            } else {
-                //不可用
-                if (mTextView.isClickable()) {
-                    mTextView.setClickable(usable);
-                    mTextView.setTextColor(mTextView.getResources().getColor(unusableColorId));
-                }
-//                String content = mLastMillis / 1000 + "秒后" + mHintText;
-                String content = mLastMillis / 1000 + "秒";
-                mTextView.setText(content);
-
-            }
-        }
-    }
-
-    /**
-     * 设置倒计时颜色
-     *
-     * @param usableColorId   可用状态下的颜色
-     * @param unusableColorId 不可用状态下的颜色
-     */
-    public CountDownUtil setCountDownColor(@ColorRes int usableColorId, @ColorRes int unusableColorId) {
-        this.usableColorId = usableColorId;
-        this.unusableColorId = unusableColorId;
-        return this;
-    }
-
-    /**
-     * 开始倒计时
-     */
-    public CountDownUtil start() {
-        mLastMillis = mCountDownMillis;
-        mHandler.sendEmptyMessage(MSG_WHAT_START);
-        return this;
-    }
-
-    public CountDownUtil setOnClickListener(@Nullable final View.OnClickListener onClickListener) {
-        TextView mTextView = mWeakReference.get();
-        if (mTextView != null)
-            mTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mHandler.removeMessages(MSG_WHAT_START);
-                    start();
-                    onClickListener.onClick(v);
-                }
-            });
-        return this;
-    }
-
-    /**
-     * 重置停止倒计时
-     */
-    public CountDownUtil reset() {
-        mLastMillis = 0;
-        mHandler.sendEmptyMessage(MSG_WHAT_START);
-        return this;
-    }
-}

+ 0 - 58
app/src/main/java/com/sheep/groups/creditcard/CreditCardConfirmDialog.java

@@ -1,58 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-
-import com.kfzs.libs.dialog.BaseDialogFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class CreditCardConfirmDialog extends BaseDialogFragment {
-
-    @BindView(R.id.btn_confirm)
-    Button btnConfirm;
-    @BindView(R.id.iv_close)
-    ImageView ivClose;
-
-    OnComfirmCallback onComfirmCallback;
-
-    @Override
-    public int dialogContentViewLayoutId() {
-        return R.layout.dialog_credit_card_comfirm;
-    }
-
-    @Override
-    public void setupContentView() {
-        setCancelable(false);
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dismiss();
-            }
-        });
-    }
-
-    @OnClick(R.id.btn_confirm)
-    public void btnClick(){
-        dismiss();
-        if (onComfirmCallback != null) {
-            onComfirmCallback.onConfirm();
-        }
-    }
-
-    public CreditCardConfirmDialog setOnComfirmCallback(OnComfirmCallback onComfirmCallback) {
-        this.onComfirmCallback = onComfirmCallback;
-        return this;
-    }
-
-    public interface OnComfirmCallback{
-        void onConfirm();
-    }
-}

+ 0 - 199
app/src/main/java/com/sheep/groups/creditcard/CreditCardDisplayFragment.java

@@ -1,199 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.kfzs.libs.DaggerFragment;
-import com.kfzs.libs.widget.loading.SupportLoadingFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class CreditCardDisplayFragment extends SupportLoadingFragment {
-
-    public static final int CARD_TYPE_NORMAL = 0;
-    public static final int CARD_TYPE_GOLD = 1;
-
-    public static final int CARD_NORMAL_PAINT = 91;
-    public static final int CARD_NORMAL_MUSICAL = 89;
-    public static final int CARD_GOLD_PAINT = 159;
-    public static final int CARD_GOLD_MUSICAL = 158;
-
-    public static final String EXTRA_CARD_TYPE = "card_type";
-
-    /**
-     * 默认值
-     */
-    private int cardType = CARD_TYPE_NORMAL;
-    private int cardDetailType = CARD_GOLD_PAINT;
-
-    @BindView(R.id.vp_credit_card_display)
-    ViewPager viewPager;
-
-    public static CreditCardDisplayFragment newInstance(int cardType){
-        Bundle bundle = new Bundle();
-        bundle.putInt(EXTRA_CARD_TYPE,cardType);
-        CreditCardDisplayFragment fragment = new CreditCardDisplayFragment();
-        fragment.setArguments(bundle);
-        return fragment;
-    }
-
-    @Override
-    public int layoutResId() {
-        return R.layout.fragment_credit_card_display;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Bundle bundle = getArguments();
-        if (bundle != null) {
-            cardType = bundle.getInt(EXTRA_CARD_TYPE);
-        }
-        //根据type设置默认值
-        if(CARD_TYPE_NORMAL == cardType){
-            cardDetailType = CARD_NORMAL_PAINT;
-        }
-        else if(CARD_TYPE_GOLD == cardType){
-            cardDetailType = CARD_GOLD_PAINT;
-        }
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-
-        List<View> views = new ArrayList<>(2);
-
-        View itemPre = LayoutInflater.from(activity).inflate(R.layout.viewpager_item_credit_card_display,null);
-        ImageView ivPrePre = itemPre.findViewById(R.id.iv_pre);
-        ImageView ivPreNext = itemPre.findViewById(R.id.iv_next);
-        ImageView ivPreCard = itemPre.findViewById(R.id.iv_card);
-        TextView tvPreDesc = itemPre.findViewById(R.id.tv_display_desc);
-        views.add(itemPre);
-
-        View itemNext = LayoutInflater.from(activity).inflate(R.layout.viewpager_item_credit_card_display,null);
-        ImageView ivNextPre = itemNext.findViewById(R.id.iv_pre);
-        ImageView ivNextNext = itemNext.findViewById(R.id.iv_next);
-        ImageView ivNextCard = itemNext.findViewById(R.id.iv_card);
-        TextView tvNextDesc = itemNext.findViewById(R.id.tv_display_desc);
-        views.add(itemNext);
-
-        ivPrePre.setImageResource(R.drawable.ic_credit_left_black_arrow);
-        ivPreNext.setImageResource(R.drawable.ic_credit_right_blue_arrow);
-        ivNextPre.setImageResource(R.drawable.ic_credit_left_blue_arrow);
-        ivNextNext.setImageResource(R.drawable.ic_credit_right_black_arrow);
-
-        if(CARD_TYPE_GOLD == cardType){
-            ivPreCard.setImageResource(R.drawable.ic_gold_credit_card_1);
-            ivNextCard.setImageResource(R.drawable.ic_gold_credit_card_2);
-            //
-            tvPreDesc.setText(R.string.desc_credit_card_gold_paint);
-            tvNextDesc.setText(R.string.desc_credit_card_gold_musical);
-        }
-        else if(CARD_TYPE_NORMAL == cardType){
-            ivPreCard.setImageResource(R.drawable.ic_normal_credit_card1);
-            ivNextCard.setImageResource(R.drawable.ic_normal_credit_card2);
-            //
-            tvPreDesc.setText(R.string.desc_credit_card_normal_paint);
-            tvNextDesc.setText(R.string.desc_credit_card_normal_musical);
-        }
-
-
-        ivPreNext.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                viewPager.setCurrentItem(1);
-            }
-        });
-
-        ivNextPre.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                viewPager.setCurrentItem(0);
-            }
-        });
-
-        CreditCardPagerAdapter adapter = new CreditCardPagerAdapter(views);
-        viewPager.setAdapter(adapter);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if(0 == position){
-                    cardDetailType = cardType == CARD_TYPE_GOLD ? CARD_GOLD_PAINT : CARD_NORMAL_PAINT;
-                }
-                else if(1 == position){
-                    cardDetailType = cardType == CARD_TYPE_GOLD ? CARD_GOLD_MUSICAL : CARD_NORMAL_MUSICAL;
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-    }
-
-
-    public int getCardDetailType() {
-        return cardDetailType;
-    }
-
-    public int getCardType() {
-        return cardType;
-    }
-
-    private static class CreditCardPagerAdapter extends PagerAdapter{
-
-        List<View> views;
-        public CreditCardPagerAdapter(List<View> list){
-            views = list;
-        }
-
-        @Override
-        public int getCount() {
-            return views == null ? 0 : views.size();
-        }
-
-        @Override
-        public boolean isViewFromObject(View arg0, Object arg1) {
-            return arg0 == arg1;
-        }
-
-        @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            container.removeView((View) object);
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            container.addView(views.get(position));
-            return views.get(position);
-        }
-
-    }
-
-
-}

+ 0 - 109
app/src/main/java/com/sheep/groups/creditcard/CreditCardInfosManager.java

@@ -1,109 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by guoxin on 2018/4/3.
- */
-
-public class CreditCardInfosManager {
-
-    private static CreditCardInfosManager instance;
-
-    private CreditCardInfosManager(){
-
-    }
-
-    public static CreditCardInfosManager getInstance(){
-        if(instance == null){
-            synchronized (CreditCardInfosManager.class){
-                if(instance == null){
-                    instance = new 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 = "";
-        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_tel_3 = "";
-        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;//卡类型
-    public String b_name;
-    public String b_mobile;
-    public String b_card;//身份证号
-    public String b_sms;
-    public String ticket;
-    public String p_city;
-    public String p_address;
-    public String p_email;
-    public String p_marray;
-    public String p_edu;
-    public String w_name;
-    public String w_city;
-    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;
-    public String c_d_relation;
-    public String c_o_name;
-    public String c_o_mobile;
-    public String c_o_relation;
-    public String o_id_expire;
-    public String o_p_number;
-    public String o_tel_1;
-    public String o_tel_2;
-    public String o_qq;
-    public boolean is_agree = false;
-
-    //页面1
-    public float phoneNum1;//停留在手机号上的时间
-    public float sfz1;//停留在身份证上的时间
-    public float firstSumLong;//停留在页面1上的时间
-    //页面2
-    public float comDetail;//停留在单位地址上的时间
-    public float comTel;//停留在单位电话上的时间
-    public float companyName;//停留在公司名字上的时间
-    public float secondSumLong;//停留在页面2上的时间
-
-}

+ 0 - 42
app/src/main/java/com/sheep/groups/creditcard/CreditCardKeys.java

@@ -1,42 +0,0 @@
-package com.sheep.groups.creditcard;
-
-/**
- * Created by guoxin on 2018/4/4.
- * 申请民生信用卡接口字段
- */
-
-public enum CreditCardKeys {
-    token("账号登录的Token"),
-    card_id("申请信用的卡类型号码"),
-    /**
-     * 基本信息部分
-     */
-    b_name("姓名"), b_mobile("手机号"), b_card("身份证"), b_sms("短信验证码"), ticket("短信验证码接口返回的ticket字段"),
-    /**
-     * 个人信息部分
-     */
-    p_city("住宅地址"), p_address("住宅城市"), p_email("电子邮件"), p_marray("婚姻状况"), p_edu("教育程度"),
-    /**
-     *工作信息部分
-     */
-    w_name("单位名称"), w_city("单位城市"), w_address("单位地址"), w_tel_1("单位电话(区号)"), w_tel_2("单位电话(电话号码)"), w_tel_3("单位电话(分机号)"), 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("常用QQ号"), is_agree("开通快捷还款");
-
-
-    CreditCardKeys(String desc){
-        this.chineseDesc = desc;
-    }
-
-    private String chineseDesc;
-
-    public String getChineseDesc() {
-        return chineseDesc;
-    }
-}

+ 0 - 15
app/src/main/java/com/sheep/groups/creditcard/DetailsComponent.java

@@ -1,15 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import com.kfzs.libs.di.http.HttpComponent;
-import com.kfzs.libs.di.http.HttpScope;
-
-import dagger.Component;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-@HttpScope
-@Component(dependencies = HttpComponent.class)
-public interface DetailsComponent {
-    void inject(ApplyForCreditCardDetailsFragment fragment);
-}

+ 0 - 26
app/src/main/java/com/sheep/groups/creditcard/DetailsContact.java

@@ -1,26 +0,0 @@
-package com.sheep.groups.creditcard;
-
-
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-
-import java.util.Map;
-
-/**
- * Created by guoxin on 2018/3/29.
- */
-
- interface DetailsContact {
-
-    interface View extends IView {
-        void showProgress(String msg);
-        void goNext();
-    }
-
-    interface Presenter extends IPresenter {
-        void commitFormData(String key, String value, String cardId);
-        void commitDetails(Map<String,String> map);
-        void  statisticsDetails(Map<String,String> map);
-    }
-
-}

+ 0 - 153
app/src/main/java/com/sheep/groups/creditcard/DetailsPresenter.java

@@ -1,153 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.util.Log;
-
-import com.kfzs.libs.IView;
-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;
-
-import javax.inject.Inject;
-
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class DetailsPresenter implements DetailsContact.Presenter {
-
-    public static final String TAG = "DetailsPresenter";
-
-    HttpService httpService;
-    DetailsContact.View view;
-
-    @Inject
-    public DetailsPresenter(HttpService service){
-        this.httpService = service;
-    }
-
-    @Override
-    public void attachedView(IView view) {
-        this.view = (DetailsContact.View) view;
-    }
-
-    @Override
-    public void detachedView() {
-        this.view = null;
-    }
-
-    @Override
-    public boolean isContactViewActive() {
-        if (view != null) {
-            return view.isViewActive();
-        }
-        return false;
-    }
-
-
-
-    @Override
-    public void commitFormData(String key, String value, String cardId) {
-        Map<String,String> map = new HashMap<>();
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("key",key);
-        map.put("value",value);
-        map.put("card_id",cardId);
-        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 );
-                    }
-                });
-    }
-
-    @Override
-    public void commitDetails(Map<String, String> map) {
-        Log.e(TAG, "commitDetails: "+map.toString() );
-        httpService
-                .commitCreditCardDetails(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() );
-                        view.showProgress(e.getLocalizedMessage());
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext: "+s );
-
-                        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 );
-                    }
-                });
-    }
-
-
-}

+ 0 - 15
app/src/main/java/com/sheep/groups/creditcard/ModifyComponent.java

@@ -1,15 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import com.kfzs.libs.di.http.HttpComponent;
-import com.kfzs.libs.di.http.HttpScope;
-
-import dagger.Component;
-
-/**
- * Created by zengjiebin on 2018/4/11.
- */
-@HttpScope
-@Component(dependencies = HttpComponent.class)
-public interface ModifyComponent {
-    void inject(ApplyForCreditCardCommitFragment fragment);
-}

+ 0 - 24
app/src/main/java/com/sheep/groups/creditcard/ModifyContact.java

@@ -1,24 +0,0 @@
-package com.sheep.groups.creditcard;
-
-
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-
-import java.util.Map;
-
-/**
- * Created by zengjiebin on 2018/4/11.
- */
-
- interface ModifyContact {
-
-    interface View extends IView {
-        void showProgress(String msg);
-        void goNext();
-    }
-
-    interface Presenter extends IPresenter {
-        void commitModify(Map<String, String> map);
-    }
-
-}

+ 0 - 97
app/src/main/java/com/sheep/groups/creditcard/ModifyPresenter.java

@@ -1,97 +0,0 @@
-package com.sheep.groups.creditcard;
-
-import android.util.Log;
-
-import com.kfzs.libs.IView;
-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;
-
-import javax.inject.Inject;
-
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by zengjiebin on 2018/4/11.
- */
-
-public class ModifyPresenter implements ModifyContact.Presenter {
-
-    public static final String TAG = "ModifyPresenter";
-
-    HttpService httpService;
-    ModifyContact.View view;
-
-    @Inject
-    public ModifyPresenter(HttpService service){
-        this.httpService = service;
-    }
-
-    @Override
-    public void attachedView(IView view) {
-        this.view = (ModifyContact.View) view;
-    }
-
-    @Override
-    public void detachedView() {
-        this.view = null;
-    }
-
-    @Override
-    public boolean isContactViewActive() {
-        if (view != null) {
-            return view.isViewActive();
-        }
-        return false;
-    }
-
-    @Override
-    public void commitModify(Map<String, String> map) {
-        Log.e(TAG, "commitModify: "+map.toString() );
-        httpService
-                .commitCreditCardModify(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() );
-                        view.showProgress(e.getLocalizedMessage());
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext: "+s );
-
-                        try {
-                            JSONObject object = new JSONObject(s);
-                            if(object.getBoolean("success")){
-                                view.goNext();
-                            }
-                            else {
-                                view.showProgress(object.getString("errors"));
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-                    }
-                });
-    }
-
-
-}

+ 0 - 9
app/src/main/java/com/sheep/groups/creditcard/OnNextStepCallback.java

@@ -1,9 +0,0 @@
-package com.sheep.groups.creditcard;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public interface OnNextStepCallback {
-    void onNextStep(int stepType);
-}

+ 0 - 216
app/src/main/java/com/sheep/groups/creditcard/fragment/CiticStepThreeFragment.java

@@ -1,216 +0,0 @@
-package com.sheep.groups.creditcard.fragment;
-
-import android.os.Bundle;
-import android.support.v7.widget.AppCompatSpinner;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Toast;
-
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.libs.di.http.HttpService;
-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.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import rx.Observable;
-import rx.Observer;
-import rx.Scheduler;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by zhanghai on 2018/4/4.
- */
-
-public class CiticStepThreeFragment extends BaseCompatFragment {
-
-
-    @BindView(R.id.edt_citic_family_name)
-    CompleteCommitEditText edtCiticFamilyName;
-    @BindView(R.id.spinner_family_relation)
-    AppCompatSpinner spinnerFamilyRelation;
-    @BindView(R.id.edt_citic_family_mobile)
-    CompleteCommitEditText edtCiticFamilyMobile;
-    @BindView(R.id.edt_citic_family_zone_code)
-    CompleteCommitEditText edtCiticFamilyZoneCode;
-    @BindView(R.id.edt_citic_family_tel)
-    CompleteCommitEditText edtCiticFamilyTel;
-    @BindView(R.id.edt_citic_urgent_name)
-    CompleteCommitEditText edtCiticUrgentName;
-    @BindView(R.id.spinner_urgent_relation)
-    AppCompatSpinner spinnerUrgentRelation;
-    @BindView(R.id.edt_citic_urgent_mobile)
-    CompleteCommitEditText edtCiticUrgentMobile;
-    @BindView(R.id.edt_citic_urgent_zone_code)
-    CompleteCommitEditText edtCiticUrgentZoneCode;
-    @BindView(R.id.edt_citic_urgent_tel)
-    CompleteCommitEditText edtCiticUrgentTel;
-    @BindView(R.id.btn_citic_commit)
-    AlphaButton btnCiticCommit;
-    Unbinder unbinder;
-
-
-
-    private ArrayAdapter<CharSequence> adapterFamilyRelatives;
-    private ArrayAdapter<CharSequence> adapterUrgentOther;
-
-    //直系亲属关系和紧急联系人关系
-    private String strFamily, strUrgent;
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fragment_citic_third_step);
-
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-
-        initSpinner();
-
-        return rootView;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @OnClick(R.id.btn_citic_commit)
-    public void onViewClicked() {
-        //直系亲属姓名
-        String familyName = edtCiticFamilyName.getText().toString();
-        if(TextUtils.isEmpty(familyName)){
-            showToast("请填写直系亲属姓名");
-            return;
-        }
-        if(TextUtils.isEmpty(strFamily) || strFamily.equals("请选择")){
-            showToast("请选择直系亲属关系");
-            return;
-        }
-        //直系亲属手机号
-        String familyMobile = edtCiticFamilyMobile.getText().toString();
-        if(TextUtils.isEmpty(familyMobile)){
-            showToast("请输入直系亲属手机号");
-            return;
-        }
-        //区号
-        String familyZoneCode = edtCiticFamilyZoneCode.getText().toString();
-        //电话
-        String familyTel = edtCiticFamilyTel.getText().toString();
-
-        //紧急联系人
-        String urgentName = edtCiticUrgentName.getText().toString();
-        if(TextUtils.isEmpty(urgentName)){
-            showToast("请填写紧急联系人姓名");
-            return;
-        }
-        if(TextUtils.isEmpty(strUrgent) || strUrgent.equals("请选择")){
-            showToast("请选择紧急联系人关系");
-            return;
-        }
-        //紧急联系人手机号
-        String urgentMobile = edtCiticUrgentMobile.getText().toString();
-        if(TextUtils.isEmpty(urgentMobile)){
-            showToast("请输入紧急联系人手机号");
-            return;
-        }
-        //区号
-        String urgentZoneCode = edtCiticUrgentZoneCode.getText().toString();
-        //电话
-        String urgentTel = edtCiticUrgentTel.getText().toString();
-
-        //亲属
-        Map<String,String> map = new HashMap<>();
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-        map.put("r_name",familyName);
-        map.put("r_relation",strFamily);
-        map.put("r_mobile",familyMobile);
-        map.put("r_tel_1",familyZoneCode);
-        map.put("r_tel_2",familyTel);
-
-        //紧急联系人
-        map.put("m_name",urgentName);
-        map.put("m_relation",strUrgent);
-        map.put("m_mobile",urgentMobile);
-        map.put("m_tel_1",urgentZoneCode);
-        map.put("m_tel_2",urgentTel);
-
-        HttpService httpService = SheepApp.getInstance().getHttpComponent().getHttpService();
-        httpService.zxRelative(map).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
-                    @Override
-                    public void onCompleted() {
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
-
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        /// ??? 提交完成后,去哪儿????
-
-                    }
-                });
-
-
-    }
-
-    /**
-     * Spinner 下拉框初始化
-     */
-    private void initSpinner() {
-        adapterFamilyRelatives = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_citic_family_relation, R.layout.spinner_citic_text_item);
-        spinnerFamilyRelation.setAdapter(adapterFamilyRelatives);
-
-        adapterUrgentOther = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_citic_urgent_relation, R.layout.spinner_citic_text_item);
-        spinnerUrgentRelation.setAdapter(adapterUrgentOther);
-
-        spinnerFamilyRelation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                strFamily = adapterFamilyRelatives.getItem(position).toString();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
-
-        //c_o_relation
-        spinnerUrgentRelation.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                strUrgent = adapterUrgentOther.getItem(position).toString();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
-    }
-}

+ 0 - 25
app/src/main/java/com/sheep/groups/creditcard/ms/MinShengCreditActivity.java

@@ -1,25 +0,0 @@
-package com.sheep.groups.creditcard.ms;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import com.sheep.groups.creditcard.ApplyForCardTabFragment;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-public class MinShengCreditActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_min_sheng_credit);
-
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "中国民生银行信用卡")
-                .setTitleFinish(this);
-
-        getSupportFragmentManager().beginTransaction().add(R.id.container,new ApplyForCardTabFragment()).commit();
-
-    }
-}

+ 0 - 98
app/src/main/java/com/sheep/groups/creditcard/zx/CreditCardZXManager.java

@@ -1,98 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-/**
- * Created by guoxin on 2018/4/3.
- */
-
-public class CreditCardZXManager {
-
-    private static CreditCardZXManager instance;
-
-    private CreditCardZXManager(){
-
-    }
-
-    public static CreditCardZXManager getInstance(){
-        if(instance == null){
-            synchronized (CreditCardZXManager.class){
-                if(instance == null){
-                    instance = new CreditCardZXManager();
-                }
-            }
-        }
-        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 = "";
-        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_tel_3 = "";
-        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 is_invite = "N";//Y,N
-
-    public String card_id;//卡类型
-    public String b_name;
-    public String b_mobile;
-    public String b_card;//身份证号
-    public String b_sms;
-    public String ticket;
-    public String p_city;
-    public String p_address;
-    public String p_email;
-    public String p_marray;
-    public String p_edu;
-    public String w_name;
-    public String w_city;
-    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;
-    public String c_d_relation;
-    public String c_o_name;
-    public String c_o_mobile;
-    public String c_o_relation;
-    public String o_id_expire;
-    public String o_p_number;
-    public String o_tel_1;
-    public String o_tel_2;
-    public String o_qq;
-    public boolean is_agree = false;
-
-
-}

+ 0 - 16
app/src/main/java/com/sheep/groups/creditcard/zx/TestActivity.java

@@ -1,16 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import com.sheep.jiuyan.samllsheep.R;
-
-public class TestActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_test);
-        getSupportFragmentManager().beginTransaction().add(R.id.container,new ZhongXinStep22Fragment()).commit();
-    }
-}

+ 0 - 16
app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Component.java

@@ -1,16 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import com.kfzs.libs.di.http.HttpComponent;
-import com.kfzs.libs.di.http.HttpScope;
-import com.sheep.groups.creditcard.ApplyForCreditCardBasicInfoFragment;
-
-import dagger.Component;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-@HttpScope
-@Component(dependencies = HttpComponent.class)
-public interface ZXStep1Component {
-    void inject(ZhongXinCreditStep1Activity activity);
-}

+ 0 - 32
app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Contact.java

@@ -1,32 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-
-import android.graphics.Bitmap;
-
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-
-import java.util.Map;
-
-/**
- * Created by guoxin on 2018/3/29.
- */
-
- interface ZXStep1Contact {
-
-    interface View extends IView {
-        void showProgress(String msg);
-        void goNext();
-        void showImageCode(String bitmap);
-    }
-
-    interface Presenter extends IPresenter {
-        void commitFormData(String key, String value, String cardId);
-        void getDynamic(Map<String, String> map);
-        void  statisticsBasics(Map<String, String> map);
-        void  commitStep1(Map<String, String> map);
-        void  getImageCode();
-        void zxBasic(Map<String,String> map);
-    }
-
-}

+ 0 - 260
app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep1Presenter.java

@@ -1,260 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
-import com.kfzs.libs.IView;
-import com.kfzs.libs.di.http.HttpService;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import javax.inject.Inject;
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ZXStep1Presenter implements ZXStep1Contact.Presenter {
-
-    public static final String TAG = "BasicInfoPresenter";
-
-    HttpService httpService;
-    ZXStep1Contact.View view;
-
-    private String ticket;
-
-    public String getTicket() {
-        return ticket;
-    }
-
-    @Inject
-    public ZXStep1Presenter(HttpService service){
-        this.httpService = service;
-    }
-
-    @Override
-    public void attachedView(IView view) {
-        this.view = (ZXStep1Contact.View) view;
-    }
-
-    @Override
-    public void detachedView() {
-        this.view = null;
-    }
-
-    @Override
-    public boolean isContactViewActive() {
-        if (view != null) {
-            return view.isViewActive();
-        }
-        return false;
-    }
-
-
-
-    @Override
-    public void commitFormData(String key, String value, String cardId) {
-//        Map<String,String> map = new HashMap<>();
-//        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-//        map.put("key",key);
-//        map.put("value",value);
-//        map.put("card_id",cardId);
-//        Log.e(TAG, "commitFormData: "+map.toString() );
-//
-//        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 );
-//                    }
-//                });
-    }
-
-    @Override
-    public void commitStep1(Map<String, String> map) {
-        Log.e(TAG, "commitStep1: "+map.toString() );
-        httpService
-                .commitCreditCardZXCode(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:commitStep1: "+e.getMessage() );
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext-commitStep1: "+s );
-
-                        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 getImageCode() {
-        Map<String,String> map = new HashMap<>();
-        map.put("token",SpUtils.getOpenId(SheepApp.mContext));
-        httpService.commitCreditCardZXImageCode()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
-                    @Override
-                    public void onCompleted() {
-
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        Log.e(TAG, "onError:getImageCode: "+e.getMessage() );
-                    }
-
-                    @Override
-                    public void onNext(String str) {
-                        Log.e(TAG, "onNext: "+str );
-                        try {
-                            JSONObject object = new JSONObject(str);
-                           if( object.getBoolean("success")){
-                               view.showImageCode(object.getJSONObject("data").getString("data"));
-                           }
-                           else {
-                               view.showProgress(object.getString("errors"));
-                           }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-//                        Log.e(TAG, "onNext: "+ str );
-                    }
-                });
-    }
-
-    @Override
-    public void zxBasic(Map<String, String> map) {
-        Log.e(TAG, "zxBasic: "+map.toString() );
-        httpService.zxBasic(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:getImageCode: "+e.getMessage() );
-                    }
-
-                    @Override
-                    public void onNext(String str) {
-                        view.goNext();
-                        Log.e(TAG, "onNext: "+ str );
-                    }
-                });
-    }
-
-    @Override
-    public void getDynamic(Map<String, String> map) {
-        Log.e(TAG, "commitCreditCardZXCode: "+map.toString() );
-        httpService
-                .commitCreditCardZXCode(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() );
-                        view.showProgress(e.getMessage());
-                    }
-
-                    @Override
-                    public void onNext(String s) {
-                        Log.e(TAG, "onNext: "+s );
-                        //保存ticket
-                        try {
-                            JSONObject object = new JSONObject(s);
-                            if(object.getBoolean("success")){
-                                ticket = object.getJSONObject("data").getString("ticket");
-                                view.showProgress(object.getString("验证码发送成功"));
-                            }
-                            else {
-                                view.showProgress(object.getString("errors"));
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-                    }
-                });
-    }
-
-    @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 );
-                    }
-                });
-    }
-}

+ 0 - 26
app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep22Contact.java

@@ -1,26 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-
-import android.graphics.Bitmap;
-
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-
-import java.util.Map;
-
-/**
- * Created by guoxin on 2018/3/29.
- */
-
- interface ZXStep22Contact {
-
-    interface View extends IView {
-        void showProgress(String msg);
-        void goNext();
-    }
-
-    interface Presenter extends IPresenter {
-        void zxCompany(Map<String, String> map);
-    }
-
-}

+ 0 - 86
app/src/main/java/com/sheep/groups/creditcard/zx/ZXStep22Presenter.java

@@ -1,86 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
-import com.kfzs.libs.IView;
-import com.kfzs.libs.di.http.HttpService;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import rx.Observer;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by guoxin on 2018/4/2.
- */
-
-public class ZXStep22Presenter implements ZXStep22Contact.Presenter {
-
-    public static final String TAG = "BasicInfoPresenter";
-
-    HttpService httpService;
-    ZXStep22Contact.View view;
-
-
-
-    @Inject
-    public ZXStep22Presenter(HttpService service){
-        this.httpService = service;
-    }
-
-    @Override
-    public void attachedView(IView view) {
-        this.view = (ZXStep22Contact.View) view;
-    }
-
-    @Override
-    public void detachedView() {
-        this.view = null;
-    }
-
-    @Override
-    public boolean isContactViewActive() {
-        if (view != null) {
-            return view.isViewActive();
-        }
-        return false;
-    }
-
-
-
-
-
-    @Override
-    public void zxCompany(Map<String, String> map) {
-        Log.e(TAG, "zxBasic: "+map.toString() );
-        httpService.zxCompany(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:getImageCode: "+e.getMessage() );
-                    }
-
-                    @Override
-                    public void onNext(String str) {
-                        view.goNext();
-                        Log.e(TAG, "onNext: "+ str );
-                    }
-                });
-    }
-
-
-}

+ 0 - 370
app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinCreditStep1Activity.java

@@ -1,370 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import android.app.DatePickerDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.widget.AppCompatSpinner;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.DatePicker;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.kfzs.libs.DaggerActivity;
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-import com.kfzs.libs.widget.CompleteCommitEditText;
-import com.kfzs.libs.widget.navigation.NavigationBar;
-import com.sheep.groups.creditcard.CITICBankOtherInfoActivity;
-import com.sheep.groups.creditcard.CountDownUtil;
-import com.sheep.groups.creditcard.RegexUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ZhongXinCreditStep1Activity extends DaggerActivity implements ZXStep1Contact.View{
-
-    private static final String TAG = "ZhongXinCreditStep1";
-    @Inject
-    ZXStep1Presenter presenter;
-    @BindView(R.id.ll_agreement)
-    LinearLayout llAgreement;
-    @BindView(R.id.cb_agreement)
-    CheckBox cbAgreement;
-    @BindView(R.id.btn_next)
-    Button btnNext;
-    @BindView(R.id.sp_tuijian)
-    AppCompatSpinner spTj;
-    @BindView(R.id.tv_dynamic)
-    TextView tvSms;
-    @BindView(R.id.et_sms)
-    CompleteCommitEditText etSms;
-    @BindView(R.id.iv_image)
-    ImageView ivImage;
-    @BindView(R.id.et_mobile)
-    CompleteCommitEditText etMobile;
-    @BindView(R.id.tv_end_expire)
-    TextView tvEndExpire;
-    @BindView(R.id.tv_start_expire)
-    TextView tvStartExpire;
-    @BindView(R.id.et_fzjg)
-    CompleteCommitEditText etFzjg;
-    @BindView(R.id.et_id_no)
-    CompleteCommitEditText etIdNo;
-    @BindView(R.id.et_name)
-    CompleteCommitEditText etName;
-    @BindView(R.id.et_image)
-    CompleteCommitEditText etImage;
-    private ArrayAdapter<CharSequence> adapter;
-    private CountDownUtil countDownUtil;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_zhong_xin_credit);
-        ButterKnife.bind(this);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "个人基本信息")
-                .setTitleFinish(this);
-
-        llAgreement.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cbAgreement.setChecked(!cbAgreement.isChecked());
-            }
-        });
-
-        setOnCompleteEdit(etName,"name");
-        setOnCompleteEdit(etIdNo,"id_card");
-
-        setOnCompleteEdit(etFzjg,"issuing_authority");
-        setOnCompleteEdit(etMobile,"mobile");
-
-        setOnCompleteEdit(etImage,"photo_num");
-
-        setOnCompleteEdit(etSms,"code");
-
-
-        adapter = ArrayAdapter.createFromResource(this, R.array.credit_card_zx_tj, R.layout.spinner_text_item);
-//        CreditCardZXManager.getInstance().c_d_relation = adapter.getItem(0).toString();
-        spTj.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String value = (String) adapter.getItem(position);
-                is_invite = value.equals("是") ? "Y" : "N";
-//                presenter.commitFormData("c_d_relation",value,CreditCardZXManager.getInstance().card_id);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-        spTj.setAdapter(adapter);
-
-        tvStartExpire.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showDatePicker(true);
-            }
-        });
-
-        tvEndExpire.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showDatePicker(false);
-            }
-        });
-
-        ivImage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                loadImage();
-            }
-        });
-
-        btnNext.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zxBasic();
-//            startActivity(new Intent(ZhongXinCreditStep1Activity.this,CITICBackOtherInfoActivity.class));
-            }
-        });
-
-        tvSms.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                sendDynamic();
-            }
-        });
-
-        presenter.getImageCode();
-//        test();
-    }
-    private String is_invite = "N";
-    private void zxBasic(){
-        if(TextUtils.isEmpty(etName.getText().toString())){
-            Toast.makeText(this,"请输入姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-
-        if(TextUtils.isEmpty(etMobile.getText().toString())){
-            Toast.makeText(this,"请输入手机号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etIdNo.getText().toString())){
-            Toast.makeText(this,"请输入身份证号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etSms.getText().toString())){
-            Toast.makeText(this,"请输入验证码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-
-
-        Map<String,String> map = new HashMap<>();
-        map.put("name",etName.getText().toString());
-        map.put("mobile",etMobile.getText().toString());
-        map.put("id_card",etIdNo.getText().toString());
-        map.put("code",etSms.getText().toString());
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-
-        map.put("is_invite",is_invite);
-
-        if(!TextUtils.isEmpty(etFzjg.getText().toString())){
-            map.put("issuing_authority",etFzjg.getText().toString());
-        }
-
-        if(!TextUtils.isEmpty(etFzjg.getText().toString())){
-            map.put("issuing_authority",etFzjg.getText().toString());
-        }
-
-        if(!TextUtils.isEmpty(tvStartExpire.getText().toString())){
-            map.put("id_date_from",etFzjg.getText().toString());
-        }
-
-        if(!TextUtils.isEmpty(tvEndExpire.getText().toString())){
-            map.put("id_date_end",etFzjg.getText().toString());
-        }
-
-        presenter.zxBasic(map);
-    }
-
-
-    private void sendDynamic(){
-
-        if(TextUtils.isEmpty(etName.getText().toString())){
-            Toast.makeText(this,"请填写姓名",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etIdNo.getText().toString())){
-            Toast.makeText(this,"请填写身份证号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(!RegexUtils.isIDCard18(etIdNo.getText().toString())){
-            Toast.makeText(this,"身份证号不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-//        if(TextUtils.isEmpty(etFzjg.getText().toString())){
-//            Toast.makeText(this,"请填写发证机关",Toast.LENGTH_SHORT).show();
-//            return;
-//        }
-//
-//        if(TextUtils.isEmpty(tvStartExpire.getText().toString())){
-//            Toast.makeText(this,"请选择有效期(起)",Toast.LENGTH_SHORT).show();
-//            return;
-//        }
-//
-//        if(TextUtils.isEmpty(tvEndExpire.getText().toString())){
-//            Toast.makeText(this,"请选择有效期(止)",Toast.LENGTH_SHORT).show();
-//            return;
-//        }
-
-        if(TextUtils.isEmpty(etImage.getText().toString())){
-            Toast.makeText(this,"请输入图形验证码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(!RegexUtils.isMobileSimple(etMobile.getText().toString())){
-            Toast.makeText(this,"手机号不正确",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-
-        Map<String,String> map = new HashMap<>();
-        map.put("name",etName.getText().toString());
-        map.put("mobile",etMobile.getText().toString());
-        map.put("id_card",etIdNo.getText().toString());
-        map.put("photo_num",etImage.getText().toString());
-        map.put("token",SpUtils.getOpenId(SheepApp.mContext));
-
-        Log.e(TAG, "sendDynamic: "+map.toString());
-        presenter.getDynamic(map);
-        //倒计时60000ms
-        //不同状态字体颜色
-        //倒计时60000ms
-    //不同状态字体颜色
-        countDownUtil = new CountDownUtil(tvSms)
-                .setCountDownMillis(60_000L)//倒计时60000ms
-                .setCountDownColor(R.color.credit_blue_color,R.color.credit_blue_color)//不同状态字体颜色
-                .start();
-    }
-
-    private void loadImage(){
-        presenter.getImageCode();
-//        Glide.with(this).download(HttpModule.BASE_URL + "credits/ecitic/img_code").into(ivImage);
-    }
-
-    private void showDatePicker(final boolean start){
-        // 获得日历对象
-        Calendar c = Calendar.getInstance();
-        // 获取当前年份
-        int year = c.get(Calendar.YEAR);
-        // 获取当前月份
-        int monthOfYear = c.get(Calendar.MONTH);
-        // 获取当前月份的天数
-        int dayOfMonth = c.get(Calendar.DAY_OF_MONTH);
-
-        new DatePickerDialog(this, new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
-                String expire = year + "/" + month + "/" + dayOfMonth;
-                if(start){
-                    tvStartExpire.setText(expire);
-                    CreditCardZXManager.getInstance().o_id_expire = expire;
-                    presenter.commitFormData("o_id_expire",expire,CreditCardZXManager.getInstance().card_id);
-                }
-                else {
-                    tvEndExpire.setText(expire);
-                    CreditCardZXManager.getInstance().o_id_expire = expire;
-                    presenter.commitFormData("o_id_expire",expire,CreditCardZXManager.getInstance().card_id);
-                }
-
-            }
-        },year,monthOfYear,dayOfMonth).show();
-
-    }
-
-    @Override
-    public IPresenter currentPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public IView currentIView() {
-        return this;
-    }
-
-    @Override
-    public void setupDaggerComponent() {
-
-        DaggerZXStep1Component.builder().httpComponent(SheepApp.getInstance().getHttpComponent()).build().inject(this);
-    }
-
-    @Override
-    public boolean isViewActive() {
-        return isFinishing();
-    }
-
-    @Override
-    public void showProgress(String msg) {
-
-    }
-
-    @Override
-    public void goNext() {
-
-//        startActivity(new Intent(ZhongXinCreditStep1Activity.this,CITICBankOtherInfoActivity.class));
-
-    }
-
-    @Override
-    public void showImageCode(String bitmap) {
-        Log.e(TAG, "showImageCode: "+bitmap );
-        Glide.with(this).load(bitmap).into(ivImage);
-    }
-
-    private void setOnCompleteEdit(final CompleteCommitEditText et, final String key){
-        et.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData(key,et.getText().toString(), CreditCardZXManager.getInstance().card_id);
-            }
-        });
-    }
-
-    private void setOnCompleteEditDouble(final CompleteCommitEditText et,final CompleteCommitEditText etQ, final String key){
-        et.setOnCompleteEditListener(new CompleteCommitEditText.OnCompleteEditListener() {
-            @Override
-            public void onCompleteEdit(String text) {
-                presenter.commitFormData(key,etQ.getText().toString()+et.getText().toString(),CreditCardZXManager.getInstance().card_id);
-            }
-        });
-    }
-}

+ 0 - 199
app/src/main/java/com/sheep/groups/creditcard/zx/ZhongXinStep22Fragment.java

@@ -1,199 +0,0 @@
-package com.sheep.groups.creditcard.zx;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentTabHost;
-import android.support.v7.widget.AppCompatSpinner;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.kfzs.libs.DaggerFragment;
-import com.kfzs.libs.IPresenter;
-import com.kfzs.libs.IView;
-import com.kfzs.libs.widget.CompleteCommitEditText;
-import com.sheep.groups.creditcard.CITICBankOtherInfoActivity;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-
-/**
- * Created by guoxin on 2018/4/4.
- */
-
-public class ZhongXinStep22Fragment extends DaggerFragment implements ZXStep22Contact.View{
-
-    @BindView(R.id.et_name)
-    CompleteCommitEditText etName;
-    @BindView(R.id.et_area)
-    CompleteCommitEditText etArea;
-    @BindView(R.id.et_city)
-    CompleteCommitEditText etCity;
-    @BindView(R.id.et_provence)
-    CompleteCommitEditText etProvence;
-    @BindView(R.id.et_tel_no)
-    CompleteCommitEditText etTelNo;
-    @BindView(R.id.et_tel_q)
-    CompleteCommitEditText etTelQ;
-    @BindView(R.id.et_company_address)
-    CompleteCommitEditText etAddress;
-
-    @BindView(R.id.sp_gwxz)
-    AppCompatSpinner spGwxz;
-    @BindView(R.id.sp_dwxz)
-    AppCompatSpinner spDwxz;
-    private ArrayAdapter<CharSequence> dwxzAdapter;
-    private ArrayAdapter<CharSequence> gwxzAdapter;
-
-    @BindView(R.id.btn_next)
-    Button btnNext;
-
-    @Inject
-    ZXStep22Presenter presenter;
-    private String dwxz;
-
-    @Override
-    public void setupDaggerComponent() {
-
-    }
-
-    @Override
-    public IPresenter currentPresenter() {
-        return presenter;
-    }
-
-    @Override
-    public IView currentIView() {
-        return this;
-    }
-
-    @Override
-    public int layoutResId() {
-        return R.layout.frg_zx_step22;
-    }
-
-    @Override
-    public void setupViews(@Nullable Bundle savedInstanceState) {
-
-        dwxzAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_zx_dwxz, R.layout.spinner_text_item);
-        gwxzAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.credit_card_zx_gwxz, R.layout.spinner_text_item);
-        spDwxz.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String value = (String) dwxzAdapter.getItem(position);
-                dwxz= value;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-        spDwxz.setAdapter(dwxzAdapter);
-        spGwxz.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String value = (String) gwxzAdapter.getItem(position);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-        spGwxz.setAdapter(gwxzAdapter);
-
-        btnNext.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                zxCompany();
-            }
-        });
-
-        dwxz = dwxzAdapter.getItem(0).toString();
-
-    }
-
-    private void zxCompany(){
-
-        if(TextUtils.isEmpty(etName.getText().toString())){
-            Toast.makeText(getActivity(),"请输入单位名称",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etProvence.getText().toString())){
-            Toast.makeText(getActivity(),"请输入省份",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etCity.getText().toString())){
-            Toast.makeText(getActivity(),"请输入城市",Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if(TextUtils.isEmpty(etArea.getText().toString())){
-            Toast.makeText(getActivity(),"请输入区/县",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etAddress.getText().toString())){
-            Toast.makeText(getActivity(),"请输入单位地址",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etTelQ.getText().toString())){
-            Toast.makeText(getActivity(),"请输入单位电话区号",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if(TextUtils.isEmpty(etTelNo.getText().toString())){
-            Toast.makeText(getActivity(),"请输入单位电话号码",Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-
-
-        Map<String,String> map = new HashMap<>();
-
-        map.put("job_type",dwxz);
-        map.put("com_name",etName.getText().toString());
-        map.put("com_province",etProvence.getText().toString());
-        map.put("com_city",etCity.getText().toString());
-        map.put("com_address",etAddress.getText().toString());
-        map.put("com_tel_1",etTelQ.getText().toString());
-        map.put("com_tel_2",etTelNo.getText().toString());
-        map.put("card_method","柜台激活");
-        map.put("token", SpUtils.getOpenId(SheepApp.mContext));
-
-        presenter.zxCompany(map);
-
-
-    }
-
-    @Override
-    public boolean isViewActive() {
-        return isAdded();
-    }
-
-    @Override
-    public void showProgress(String msg) {
-
-    }
-
-    @Override
-    public void goNext() {
-        Activity activity = getActivity();
-        if(activity != null && activity instanceof CITICBankOtherInfoActivity){
-            ((CITICBankOtherInfoActivity)activity).gotoNext(2);
-        }
-
-    }
-}

+ 0 - 5
app/src/main/res/color/gx_s_credit_card_card_type_btn_text.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="#0089ee"/>
-    <item android:color="@android:color/black"/>
-</selector>

+ 0 - 5
app/src/main/res/color/gx_s_credit_card_step_text.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="#0089ee"/>
-    <item android:color="#d4d4d4"/>
-</selector>

+ 0 - 8
app/src/main/res/color/selector_color_citic_tv.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_activated="true" android:color="@color/citic_tab_activated"/>
-    <item android:state_pressed="true" android:color="@color/citic_tab_activated"/>
-    <item android:state_selected="true" android:color="@color/citic_tab_activated"/>
-    <item android:color="@color/citic_tab"/>
-</selector>

二进制
app/src/main/res/drawable-xhdpi/ic_zx_card.png


二进制
app/src/main/res/drawable-xxhdpi/ic_credit_left_black_arrow.png


二进制
app/src/main/res/drawable-xxhdpi/ic_credit_left_blue_arrow.png


二进制
app/src/main/res/drawable-xxhdpi/ic_credit_right_blue_arrow.png


二进制
app/src/main/res/drawable-xxhdpi/ic_discounts.png


二进制
app/src/main/res/drawable-xxhdpi/ic_gold_credit_card_1.jpg


二进制
app/src/main/res/drawable-xxhdpi/ic_normal_credit_card1.png


+ 0 - 15
app/src/main/res/drawable/btn_citic_commit_background.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape >
-            <solid android:color="#34a5e6"/>
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="#29d6fe"/>
-        </shape>
-    </item>
-</selector>

+ 0 - 10
app/src/main/res/drawable/gx_bg_credit_card_white_corner.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid
-        android:color="@android:color/white"
-        />
-
-    <corners
-        android:radius="16dp"
-        />
-</shape>

+ 0 - 10
app/src/main/res/drawable/gx_bg_credit_card_white_corner1.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid
-        android:color="@android:color/white"
-        />
-
-    <corners
-        android:radius="10dp"
-        />
-</shape>

+ 0 - 10
app/src/main/res/drawable/gx_bg_dialog_white_with_coner.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <corners
-        android:radius="10dp"
-        />
-    <solid
-        android:color="@android:color/white"
-        />
-</shape>

+ 0 - 10
app/src/main/res/drawable/gx_bg_line.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid
-        android:color="#f0f0f0"
-        />
-    <size
-        android:height="0.75dp"
-        />
-</shape>

+ 0 - 16
app/src/main/res/drawable/gx_btn_credit_card_comfirm.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid
-        android:color="@android:color/white"
-        />
-
-    <corners
-        android:radius="15dp"
-        />
-
-    <stroke
-        android:width="1dp"
-        android:color="#0089ee"
-        />
-</shape>

+ 0 - 12
app/src/main/res/drawable/gx_credit_card_btn_gradient_blue.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:startColor="#29d6fe"
-        android:endColor="#34a5e6"
-        />
-
-    <corners
-        android:radius="20dp"
-        />
-</shape>

+ 0 - 20
app/src/main/res/drawable/gx_credit_card_radiobtn.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true" android:state_enabled="true">
-        <shape android:shape="oval">
-            <solid android:color="#000000" />
-            <size android:width="11dp" android:height="11dp" />
-        </shape>
-    </item>
-
-    <item android:state_checked="false" android:state_enabled="true">
-        <shape android:shape="oval">
-            <solid android:color="#00ffffff" />
-            <stroke android:color="#b5b5b5" android:width="1dp" />
-            <size android:width="11dp" android:height="11dp" />
-        </shape>
-    </item>
-
-
-</selector>

+ 0 - 22
app/src/main/res/drawable/gx_s_bg_credit_card_step_cycle.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-    <item android:state_selected="true">
-        <shape android:shape="oval">
-            <solid
-                android:color="#0089ee"
-                />
-        </shape>
-
-    </item>
-    <item>
-        <shape android:shape="oval">
-            <solid
-                android:color="#d4d4d4"
-                />
-        </shape>
-
-    </item>
-
-</selector>

+ 0 - 10
app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_corner_left.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid
-        android:color="@android:color/white"
-        />
-    <corners
-        android:bottomLeftRadius="12dp"
-        android:topLeftRadius="12dp"
-        />
-</shape>

+ 0 - 10
app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_corner_right.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid
-        android:color="@android:color/white"
-        />
-    <corners
-        android:bottomRightRadius="12dp"
-        android:topRightRadius="12dp"
-        />
-</shape>

+ 0 - 6
app/src/main/res/drawable/gx_s_bg_credit_card_step_frame_no_corner.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid
-        android:color="@android:color/white"
-        />
-</shape>

+ 0 - 22
app/src/main/res/drawable/gx_s_bg_credit_card_step_line.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-    <item android:state_selected="true">
-        <shape >
-            <solid
-                android:color="#0089ee"
-                />
-        </shape>
-
-    </item>
-
-    <item>
-        <shape>
-            <solid
-                android:color="#d4d4d4"
-                />
-        </shape>
-
-    </item>
-</selector>

+ 0 - 38
app/src/main/res/drawable/gx_s_credit_card_card_type_btn.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_selected="true"
-        >
-        <shape>
-            <stroke
-                android:color="#0089ee"
-                android:width="1dp"
-                />
-            <corners
-                android:radius="5dp"
-                />
-            <solid
-                android:color="@android:color/white"
-                />
-        </shape>
-
-    </item>
-
-    <item
-        android:state_selected="false"
-        >
-        <shape>
-            <stroke
-                android:color="@android:color/black"
-                android:width="1dp"
-                />
-            <corners
-                android:radius="5dp"
-                />
-            <solid
-                android:color="@android:color/white"
-                />
-        </shape>
-
-    </item>
-</selector>

+ 0 - 8
app/src/main/res/drawable/selector_drawable_citic_in.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_activated="true" android:drawable="@drawable/shape_citic_tab_in"/>
-    <item android:state_pressed="true" android:drawable="@drawable/shape_citic_tab_in"/>
-    <item android:state_selected="true" android:drawable="@drawable/shape_citic_tab_in"/>
-    <item android:drawable="@drawable/shape_citic_tab_in_white"/>
-</selector>

+ 0 - 8
app/src/main/res/drawable/selector_drawable_citic_out.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_activated="true" android:drawable="@drawable/shape_citic_tab_out"/>
-    <item android:state_pressed="true" android:drawable="@drawable/shape_citic_tab_out"/>
-    <item android:state_selected="true" android:drawable="@drawable/shape_citic_tab_out"/>
-    <item android:drawable="@drawable/shape_citic_tab_out_white"/>
-</selector>

+ 0 - 9
app/src/main/res/drawable/shape_citic_tab_in.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#D50004" />
-    <size
-        android:width="@dimen/citic_tab_in"
-        android:height="@dimen/citic_tab_in" />
-    <corners android:radius="@dimen/citic_tab_in_radius" />
-</shape>

+ 0 - 6
app/src/main/res/drawable/shape_citic_tab_in_white.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#ffffff" />
-    <corners android:radius="@dimen/citic_tab_in_radius" />
-</shape>

+ 0 - 9
app/src/main/res/drawable/shape_citic_tab_out.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#F5CAD1" />
-    <size
-        android:width="@dimen/citic_tab_out"
-        android:height="@dimen/citic_tab_out" />
-    <corners android:radius="@dimen/citic_tab_out_radius" />
-</shape>

+ 0 - 6
app/src/main/res/drawable/shape_citic_tab_out_white.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#ffffff" />
-    <corners android:radius="@dimen/citic_tab_out_radius" />
-</shape>

+ 0 - 82
app/src/main/res/layout/activity_apply_for_credit_card.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        >
-        <LinearLayout
-            android:id="@+id/ll_credit_card_step1"
-            style="@style/creditCardStepItemStyle"
-            android:background="@drawable/gx_s_bg_credit_card_step_frame_corner_left">
-
-            <TextView
-                style="@style/creditCardStepItemTitleStyle"
-                android:text="选卡及基本信息" />
-
-            <RelativeLayout style="@style/creditCardStepLineFrameStyle">
-
-                <View style="@style/creditCardStepLineStyle" />
-
-                <TextView
-                    style="@style/creditCardStepIndexStyle"
-                    android:text="1" />
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_credit_card_step2"
-            style="@style/creditCardStepItemStyle"
-            android:background="@drawable/gx_s_bg_credit_card_step_frame_no_corner">
-
-            <TextView
-                style="@style/creditCardStepItemTitleStyle"
-                android:text="详细信息" />
-
-            <RelativeLayout style="@style/creditCardStepLineFrameStyle">
-
-                <View style="@style/creditCardStepLineStyle" />
-
-                <TextView
-                    style="@style/creditCardStepIndexStyle"
-                    android:text="2" />
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_credit_card_step3"
-            style="@style/creditCardStepItemStyle"
-            android:background="@drawable/gx_s_bg_credit_card_step_frame_corner_right">
-
-            <TextView
-                style="@style/creditCardStepItemTitleStyle"
-                android:text="确认提交" />
-
-            <RelativeLayout style="@style/creditCardStepLineFrameStyle">
-
-                <View style="@style/creditCardStepLineStyle" />
-
-                <TextView
-                    style="@style/creditCardStepIndexStyle"
-                    android:text="3" />
-
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/fl_credit_card_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        />
-
-</LinearLayout>

+ 0 - 31
app/src/main/res/layout/activity_citic_bank_other_info.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f3f3f3"
-    android:orientation="vertical">
-    <include layout="@layout/title"/>
-
-    <android.support.v4.app.FragmentTabHost
-        android:id="@android:id/tabhost"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="@color/gray" />
-
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="0" />
-    </android.support.v4.app.FragmentTabHost>
-
-    <FrameLayout
-        android:id="@+id/realtabcontent"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-</LinearLayout>

+ 0 - 26
app/src/main/res/layout/activity_citic_bank_other_info_tab.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/content_padding_10"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="@dimen/citic_tab_out"
-        android:layout_height="@dimen/citic_tab_out"
-        android:background="@drawable/selector_drawable_citic_out"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/activity_citic_bank_other_info_tab_tv"
-            android:layout_width="@dimen/citic_tab_in"
-            android:layout_height="@dimen/citic_tab_in"
-            android:background="@drawable/selector_drawable_citic_in"
-            android:gravity="center"
-            android:text="1"
-            android:textColor="@color/selector_color_citic_tv"
-            android:textSize="11sp" />
-    </LinearLayout>
-</LinearLayout>

+ 0 - 15
app/src/main/res/layout/activity_min_sheng_credit.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/title" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/bg_class_grey"
-        android:id="@+id/container"/>
-</LinearLayout>
-

+ 0 - 10
app/src/main/res/layout/activity_test.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
-    android:id="@+id/container"
-    tools:context="com.sheep.groups.creditcard.zx.TestActivity">
-
-</FrameLayout>

+ 0 - 286
app/src/main/res/layout/activity_zhong_xin_credit.xml

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/bg_class_grey"
-    android:orientation="vertical">
-
-
-    <include layout="@layout/title" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="@dimen/content_padding_13"
-            >
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/gx_bg_credit_card_white_corner"
-                android:padding="10dp"
-                android:text="@string/ms_top_str" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="带'*'为必填项,其他为非必填项"
-                android:layout_marginTop="@dimen/content_padding_13"
-                android:padding="10dp"
-                android:textSize="11sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="10dp"
-                    android:background="@drawable/gx_bg_credit_card_white_corner"
-                    >
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="*选择类型" />
-
-                    <ImageView
-                        android:layout_width="144dp"
-                        android:layout_height="90dp"
-                        android:layout_marginTop="@dimen/content_padding"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/ic_zx_card" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/content_padding"
-                        android:text="中信易卡(金卡)" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle"
-                    android:background="@drawable/gx_bg_credit_card_white_corner1"
-                    android:layout_marginTop="16dp"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp"
-                    android:layout_marginBottom="16dp"
-                    >
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle1"
-                        android:text="*中文姓名:	 " />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请输入中文名字" />
-
-                </LinearLayout>
-
-                <!--<LinearLayout style="@style/creditCardInputItemStyle"-->
-                    <!--android:background="@drawable/gx_bg_credit_card_white_corner1"-->
-                    <!--android:layout_marginTop="16dp"-->
-                    <!--android:layout_marginBottom="16dp"-->
-                    <!--android:paddingRight="10dp"-->
-                    <!--android:paddingLeft="10dp"-->
-                    <!--&gt;-->
-
-                    <!--<TextView-->
-                        <!--style="@style/creditCardInputItemTitleStyle1"-->
-                        <!--android:text="*姓名拼音:	" />-->
-
-                    <!--<com.kfzs.libs.widget.CompleteCommitEditText-->
-                        <!--android:id="@+id/et_"-->
-                        <!--style="@style/creditCardInputItemEtStyle"-->
-                        <!--android:hint="请输入" />-->
-
-                <!--</LinearLayout>-->
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="10dp"
-                    android:background="@drawable/gx_bg_credit_card_white_corner"
-                    >
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="*身份证号:" />
-
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/et_id_no"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请输入身份证号" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="证件发证机关:" />
-
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/et_fzjg"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请输入发证机关" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="有效期(起):" />
-
-                        <TextView
-                            android:id="@+id/tv_start_expire"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请选择" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="有效期(止):" />
-
-                        <TextView
-                            android:id="@+id/tv_end_expire"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请选择" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="*手机号码:	" />
-
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/et_mobile"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请输入手机号" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle1"
-                            android:text="*图形验证码:" />
-
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/et_image"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请输入图形验证码" />
-
-                        <ImageView
-                            android:id="@+id/iv_image"
-                            android:layout_width="80dp"
-                            android:layout_height="match_parent"
-                            />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle"
-                    android:background="@drawable/gx_bg_credit_card_white_corner1"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    >
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle1"
-                        android:text="*手机动态码:" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_sms"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请输入验证码" />
-
-                    <TextView
-                        android:id="@+id/tv_dynamic"
-                        style="@style/creditCardInputItemDynamicStyle"
-                        android:text="请点击重新获取验证码"
-                        android:gravity="left"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle"
-                    android:background="@drawable/gx_bg_credit_card_white_corner1"
-                    android:paddingRight="10dp"
-                    android:paddingLeft="10dp"
-                    android:layout_marginBottom="16dp"
-                    >
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle1"
-                        android:text="是否他人推荐:" />
-
-                    <android.support.v7.widget.AppCompatSpinner
-                        android:id="@+id/sp_tuijian"
-                        style="@style/creditCardInputItemSpinnerStyle"
-                        />
-
-                </LinearLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_agreement"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                >
-                <CheckBox
-                    android:id="@+id/cb_agreement"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:enabled="false"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="12dp"
-                    android:clickable="false"
-                    android:checked="true"
-                    />
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="15dp"
-                    android:text="@string/ms_bottom_str"
-                    />
-
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/btn_next"
-                style="@style/style_button"
-                android:text="下一步>"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="中信银行版权所有 京ICP证030779-1号"
-                android:gravity="center"
-                android:textSize="10sp"
-                />
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>

+ 0 - 37
app/src/main/res/layout/dialog_credit_card_agreement.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="340dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="340dp"
-        android:layout_gravity="center"
-        android:background="@drawable/gx_bg_dialog_white_with_coner"
-        android:orientation="vertical"
-        android:paddingBottom="40dp">
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="32dp">
-
-            <ImageView
-                android:id="@+id/iv_close"
-                style="@style/creditCardDialogCloseStyle"
-                android:src="@drawable/ic_credit_card_close"
-                />
-        </RelativeLayout>
-
-        <WebView
-            android:id="@+id/webview"
-            android:layout_width="match_parent"
-            android:layout_height="250dp"
-             />
-
-    </LinearLayout>
-
-</FrameLayout>

+ 0 - 43
app/src/main/res/layout/dialog_credit_card_comfirm.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/gx_bg_dialog_white_with_coner"
-        android:orientation="vertical"
-        >
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="32dp">
-
-            <ImageView
-                android:id="@+id/iv_close"
-                android:src="@drawable/ic_credit_card_close"
-                style="@style/creditCardDialogCloseStyle" />
-        </RelativeLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:text="本人同意并授权中国民生银行向中国人民银行金融信用基础数据库(人行数据库)查询、留存、使用本人基本信息和信用报告。"
-            />
-
-        <Button
-            android:id="@+id/btn_confirm"
-            android:text="本人确认及同意"
-            style="@style/creditCardConfirmBtnStyle" />
-
-    </LinearLayout>
-
-</FrameLayout>

+ 0 - 160
app/src/main/res/layout/fragment_apply_for_credit_card_basic_info.xml

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingBottom="20dp"
-        android:paddingLeft="@dimen/content_padding_10"
-        android:paddingRight="@dimen/content_padding_10">
-
-        <LinearLayout
-            style="@style/creditCardInputGroupStyle"
-            android:layout_marginTop="@dimen/content_padding_13"
-            android:orientation="vertical"
-            android:paddingBottom="12dp">
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="卡片选择" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <Button
-                    android:id="@+id/btn_card_normal"
-                    style="@style/creditCardCardTypeBtnStyle"
-                    android:text="普卡" />
-
-                <Button
-                    android:id="@+id/btn_card_gold"
-                    style="@style/creditCardCardTypeBtnStyle"
-                    android:layout_marginLeft="25dp"
-                    android:text="金卡" />
-            </LinearLayout>
-
-            <FrameLayout
-                android:id="@+id/fl_credit_card_display_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            style="@style/creditCardInputGroupStyle"
-            android:paddingTop="@dimen/content_padding_10"
-            android:paddingBottom="@dimen/content_padding_10"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/content_padding_13">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_discounts" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:text="首年免年费,当年刷卡消费5笔免次年年费" />
-
-        </LinearLayout>
-
-        <LinearLayout style="@style/creditCardInputGroupStyle">
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="基本信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="姓名" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请输入您的姓名" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="手机号" />
-
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_mobile"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请输入您的手机号"
-                        android:inputType="number"
-                        android:maxLength="11" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="身份证" />
-
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_id_no"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:digits="@string/digits_id_no"
-                        android:hint="请输入您的身份证号码"
-                        android:maxLength="18" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="短信验证码" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_dynamic"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请输入您的验证码"
-                        android:inputType="number"
-                        android:maxLength="6" />
-
-                    <TextView
-                        android:id="@+id/tv_dynamic"
-                        style="@style/creditCardInputItemDynamicStyle"
-                        android:text="获取验证码"
-
-                        />
-                </LinearLayout>
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/btn_next"
-            style="@style/style_button"
-            android:text="下一步" />
-
-        <TextView
-            android:id="@+id/tv_agreement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:textSize="10sp" />
-
-    </LinearLayout>
-
-</ScrollView>

+ 0 - 301
app/src/main/res/layout/fragment_apply_for_credit_card_commit.xml

@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f4f4f4"
-    android:scrollbars="none"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingBottom="20dp"
-        >
-
-
-        <LinearLayout style="@style/creditCardInputGroupStyle"
-            android:layout_marginTop="0dp"
-            >
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="个人信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="证件有效期" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_card_time"
-                        style="@style/creditCardInputItemEtStyle"
-                        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">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="所在地" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_address_origin"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请选择"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="住在地址" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_address_now"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请选择"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="电子邮箱" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        style="@style/creditCardInputItemEtStyle"
-                        android:id="@+id/edit_email"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="婚姻状况" />
-
-                    <CheckBox
-                        android:id="@+id/cbx_marry_yes"
-                        style="@style/checkbox_creditcard_marry_style"
-                        android:text="是"/>
-                    <CheckBox
-                        android:id="@+id/cbx_marry_no"
-                        style="@style/checkbox_creditcard_marry_style"
-                        android:text="否"
-                        android:layout_marginLeft="30dp"
-                        />
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="教育程度" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_edu_info"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位名称" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_company_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位城市" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_company_city"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位地址" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_company_address"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位电话" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_company_tel"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="工作年限" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_work_life"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="3"
-                        >
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle"
-                            android:text="直属亲属名字" />
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/edit_family_name"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请填写"
-                            android:inputType="number"
-                            android:maxLength="11"
-                            android:enabled="false"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        >
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle"
-                            android:layout_width="wrap_content"
-                            android:paddingRight="4dp"
-                            android:text="关系" />
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/edit_relationship"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="请填写"
-                            android:inputType="number"
-                            android:maxLength="11"
-                            android:enabled="false"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="3"
-                        >
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle"
-                            android:layout_width="wrap_content"
-                            android:paddingRight="4dp"
-                            android:text="电话" />
-                        <com.kfzs.libs.widget.CompleteCommitEditText
-                            android:id="@+id/edit_family_tel"
-                            style="@style/creditCardInputItemEtStyle"
-                            android:hint="186****4624"
-                            android:inputType="number"
-                            android:maxLength="11"
-                            android:enabled="false"/>
-                    </LinearLayout>
-
-
-
-                </LinearLayout>
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="其他联系人" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/edit_relationship_other"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写"
-                        android:inputType="number"
-                        android:maxLength="11"
-                        android:enabled="false"/>
-
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="请确认您填写的信息无误并提交申请"
-            android:textColor="#b5b5b5"
-            android:textSize="11sp"
-            android:gravity="center"
-            android:layout_marginTop="@dimen/content_padding_20"
-            />
-        <TextView
-            android:id="@+id/btn_commit_info"
-            style="@style/style_button"
-            android:text="提交申请" />
-
-        <TextView
-            android:id="@+id/btn_modify_infos"
-            style="@style/style_button"
-            android:text="修改提交信息"
-            android:visibility="gone"/>
-
-    </LinearLayout>
-
-</ScrollView>

+ 0 - 399
app/src/main/res/layout/fragment_apply_for_credit_card_details.xml

@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f4f4f4"
-    android:scrollbars="none"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingBottom="20dp"
-        >
-
-
-        <LinearLayout style="@style/creditCardInputGroupStyle"
-            android:layout_marginTop="0dp"
-            >
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="个人信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="住宅城市" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_city"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写所在城市" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="住宅地址" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_address"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="详细填写精确到,街道,门牌号"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="电子邮箱" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_email"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:digits="@string/digits_email"
-                        android:hint="请提供电子账单发送的邮箱地址"
-                        />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="婚姻状况" />
-
-                    <RadioGroup
-                        android:id="@+id/rg_marray"
-                        style="@style/creditCardInputItemRadiogroupStyle">
-                        <RadioButton
-                            android:id="@+id/rb_marray_n"
-                            android:text=" 未婚"
-                            style="@style/creditCardInputItemRadioBtnStyle" />
-
-                        <RadioButton
-                            android:id="@+id/rb_marray_y"
-                            android:text=" 已婚"
-                            style="@style/creditCardInputItemRadioBtnStyle" />
-
-                        <RadioButton
-                            android:id="@+id/rb_marray_o"
-                            android:text=" 其他"
-                            style="@style/creditCardInputItemRadioBtnStyle" />
-
-                    </RadioGroup>
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="教育程度" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_education"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请选择教育程度"
-                         />
-
-                </LinearLayout>
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <LinearLayout style="@style/creditCardInputGroupStyle">
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="工作信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位名称" />
-
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_company_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写单位名称,15字以内" />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位城市" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_company_city"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="请填写所在城市"
-                         />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位地址" />
-
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_company_address"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="卡片将邮寄此地址,请详细填写信息"
-                         />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="单位电话" />
-
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_company_phone_q"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="1"
-                        android:hint="区号"
-                        android:inputType="number"/>
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_company_phone_no"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="3"
-                        android:hint="电话号码"
-                        android:inputType="number"/>
-                    <com.kfzs.libs.widget.TimeEditText
-                        android:id="@+id/et_company_phone_f"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="2"
-                        android:hint="分机号(选填)"
-                        android:inputType="number"/>
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="工作年限" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_work_year"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:inputType="number"
-                        android:hint="工作年限多少年"
-                        android:maxLength="2" />
-
-                </LinearLayout>
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <LinearLayout style="@style/creditCardInputGroupStyle">
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="联系人信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="直属亲属" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_ir_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="1"
-                        android:hint="姓名"
-                        />
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_ir_mobile"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="2"
-                        android:hint="手机号"
-                        android:maxLength="11"
-                        android:inputType="number"/>
-
-                    <android.support.v7.widget.AppCompatSpinner
-                        android:id="@+id/sp_relationship_immediate_relatives"
-                        style="@style/creditCardInputItemSpinnerStyle"
-                        android:layout_weight="1"
-                        />
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="其他联系人" />
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_other_r_name"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="1"
-                        android:hint="姓名"
-                        />
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_other_r_mobile"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="2"
-                        android:hint="手机号"
-                        android:maxLength="11"
-                        android:inputType="number"/>
-                    <android.support.v7.widget.AppCompatSpinner
-                        android:id="@+id/sp_relationship_other"
-                        style="@style/creditCardInputItemSpinnerStyle"
-                        android:layout_weight="1"
-                        />
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        <LinearLayout style="@style/creditCardInputGroupStyle">
-
-            <TextView
-                style="@style/creditCardInputGroupTitleStyle"
-                android:text="其他信息" />
-
-            <LinearLayout style="@style/creditCardInputItemFrameStyle">
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="证件有效期" />
-
-                    <TextView
-                        android:id="@+id/tv_id_no_expire"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="1"
-                        android:hint="身份证有效期终止日期"
-                        android:inputType="number"
-                        />
-
-                    <CheckBox
-                        android:id="@+id/cb_expire"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:button="@drawable/gx_credit_card_radiobtn"
-                        android:textSize="11sp"
-                        android:textColor="#b5b5b5"
-                        android:text=" 长期有效"
-                        />
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="车牌号码" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_car_no"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="车牌号(选填)"
-                         />
-
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="住宅电话" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_home_q"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:layout_weight="1"
-                        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:inputType="number"/>
-                </LinearLayout>
-
-                <LinearLayout style="@style/creditCardInputItemStyle">
-
-                    <TextView
-                        style="@style/creditCardInputItemTitleStyle"
-                        android:text="常用QQ号" />
-
-                    <com.kfzs.libs.widget.CompleteCommitEditText
-                        android:id="@+id/et_qq"
-                        style="@style/creditCardInputItemEtStyle"
-                        android:hint="常用QQ号(选填)"
-                        android:inputType="number"
-                         />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    >
-
-                    <LinearLayout style="@style/creditCardInputItemStyle">
-
-                        <TextView
-                            style="@style/creditCardInputItemTitleStyle"
-                            android:text="开通快捷还款" />
-                        <CheckBox
-                            android:id="@+id/cb_agreement"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:button="@drawable/gx_credit_card_radiobtn"
-                            android:textSize="11sp"
-                            android:textColor="#b5b5b5"
-                            android:text=" 同意个人人民币结算账户协议并申请"
-                            />
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="15dp"
-                        android:text="开民生银行余额理财电子账户绑定信用卡自动还款"
-                        android:textColor="#444444"
-                        android:textSize="9sp" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <com.kfzs.libs.widget.alpha.AlphaButton
-            android:id="@+id/btn_next"
-            style="@style/creditCardBtnGradientStyle"
-            android:text="下一步" />
-
-
-    </LinearLayout>
-
-</ScrollView>

+ 0 - 223
app/src/main/res/layout/fragment_citic_bank_other_info1.xml

@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"--><!--xmlns:app="http://schemas.android.com/apk/res-auto"--><!--android:layout_width="match_parent"--><!--android:layout_height="match_parent">-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/content_padding_10"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="带'*'为必填项,其他为非必填项"
-        android:textColor="#FA7200"
-        android:textSize="12sp" />
-
-    <TextView
-        android:id="@+id/citic_addr_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:singleLine="true"
-        android:text="*填写住宅地址信息:"
-        android:textColor="#545454"
-        android:textSize="13sp" />
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#ffffff">
-
-        <EditText
-            android:id="@+id/citic_province"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="请填写所在省份"
-            android:maxLength="30"
-            android:padding="@dimen/content_padding_10"
-            android:textColor="#545454"
-            android:textSize="13sp" />
-        <View
-            android:id="@+id/citic_province_line"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#F0F0F0"
-            app:layout_constraintTop_toBottomOf="@+id/citic_province"/>
-
-        <EditText
-            android:id="@+id/citic_city"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="请填写所在城市"
-            android:maxLength="30"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@+id/citic_province_line" />
-        <View
-            android:id="@+id/citic_city_line"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#F0F0F0"
-            app:layout_constraintTop_toBottomOf="@+id/citic_city"/>
-
-        <EditText
-            android:id="@+id/citic_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="请填写所在区县"
-            android:maxLength="30"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@+id/citic_city_line" />
-        <View
-            android:id="@+id/citic_area_line"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#F0F0F0"
-            app:layout_constraintTop_toBottomOf="@+id/citic_area"/>
-
-        <TextView
-            android:id="@+id/citic_addr"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:text="*住宅地址:"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@+id/citic_area_line" />
-
-        <EditText
-            android:id="@+id/citic_addr_et"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="住宅地址"
-            android:maxLength="30"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/citic_addr"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/citic_addr"
-            app:layout_constraintTop_toBottomOf="@+id/citic_area" />
-
-        <View
-            android:id="@+id/citic_addr_line"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#F0F0F0"
-            app:layout_constraintTop_toBottomOf="@+id/citic_addr"/>
-        <TextView
-            android:id="@+id/citic_phone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:text="住宅电话:"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@+id/citic_addr_line" />
-
-        <EditText
-            android:id="@+id/citic_area_code"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="区号"
-            android:inputType="number"
-            android:maxLength="4"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/citic_phone"
-            app:layout_constraintStart_toEndOf="@+id/citic_phone"
-            app:layout_constraintTop_toBottomOf="@+id/citic_addr_line" />
-        <View
-            android:layout_width="1px"
-            android:layout_height="@dimen/content_padding_20"
-            android:background="#EAEAEA"
-            app:layout_constraintTop_toTopOf="@+id/citic_phone"
-            app:layout_constraintBottom_toBottomOf="@+id/citic_phone"
-            app:layout_constraintStart_toEndOf="@+id/citic_area_code"
-            app:layout_constraintTop_toBottomOf="@+id/citic_addr_line"/>
-
-        <EditText
-            android:id="@+id/citic_phone_et"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="电话号码"
-            android:inputType="phone"
-            android:maxLength="11"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/citic_area_code"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/citic_area_code"
-            app:layout_constraintTop_toBottomOf="@+id/citic_addr_line" />
-
-        <View
-            android:id="@+id/citic_phone_line"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#F0F0F0"
-            app:layout_constraintTop_toBottomOf="@+id/citic_phone"/>
-        <TextView
-            android:id="@+id/citic_email"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_20"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:text="*电子邮件:"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@+id/citic_phone_line" />
-
-        <EditText
-            android:id="@+id/citic_email_et"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:hint="电子邮件"
-            android:inputType="textEmailAddress"
-            android:maxLength="30"
-            android:padding="@dimen/content_padding_10"
-            android:singleLine="true"
-            android:textColor="#545454"
-            android:textSize="13sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/citic_email"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/citic_email"
-            app:layout_constraintTop_toBottomOf="@+id/citic_phone_line" />
-
-    </android.support.constraint.ConstraintLayout>
-
-    <com.kfzs.libs.widget.alpha.AlphaButton
-        android:id="@+id/btn_citic_next_step"
-        style="@style/citic_creditCardBtnGradientStyle"
-        android:text="下一步 >"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:gravity="center"
-        android:singleLine="true"
-        android:text="中信银行版权所有 京ICP证030779-1号"
-        android:textColor="#545454"
-        android:textSize="13sp" />
-</LinearLayout><!--</ScrollView>-->

+ 0 - 310
app/src/main/res/layout/fragment_citic_third_step.xml

@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f3f3f3"
-    android:orientation="vertical">
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingLeft="@dimen/content_padding_10"
-        android:paddingRight="@dimen/content_padding_10"
-        android:text="带'*'为必填项,其他为非必填项"
-        android:textColor="#FA7200"
-        android:textSize="12sp" />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_margin="10dp"
-        android:background="@color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="直系亲属联系人姓名:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_family_name"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                android:hint="直系亲属姓名"
-                style="@style/citic_creditCardFontStyle"/>
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="直系亲属联系人关系:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-
-            <android.support.v7.widget.AppCompatSpinner
-                android:id="@+id/spinner_family_relation"
-                android:layout_width="100dp"
-                android:layout_height="30dp"
-                android:background="@null"
-                style="@style/citic_creditCardFontStyle"
-                android:dropDownVerticalOffset="30dp"
-                android:singleLine="true"/>
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="手机号码:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_family_mobile"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"
-                android:inputType="phone"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="住宅电话:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_family_zone_code"
-                android:layout_width="80dp"
-                android:layout_height="wrap_content"
-                android:inputType="number"
-                style="@style/citic_creditCardFontStyle"
-                android:gravity="center"
-                android:hint="区号"/>
-            <View
-                android:layout_width="2dp"
-                android:layout_height="20dp"
-                android:background="@color/gray"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_family_tel"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"
-                android:gravity="center"
-                android:inputType="number"
-                android:hint="电话"/>
-        </LinearLayout>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="紧急联系人姓名:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_urgent_name"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"/>
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="紧急联系人关系:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <android.support.v7.widget.AppCompatSpinner
-                android:id="@+id/spinner_urgent_relation"
-                android:layout_width="100dp"
-                android:layout_height="30dp"
-                android:background="@null"
-                android:dropDownVerticalOffset="30dp"
-                android:singleLine="true"
-                style="@style/citic_creditCardFontStyle"/>
-
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="@color/red"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="手机号码:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_urgent_mobile"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"
-                android:inputType="phone"/>
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/gray"/>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="住宅电话:"
-                android:textColor="@color/gray_4"
-                android:textSize="13sp"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_urgent_zone_code"
-                android:layout_width="80dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"
-                android:inputType="number"
-                android:gravity="center"
-                android:hint="区号"/>
-            <View
-                android:layout_width="2dp"
-                android:layout_height="20dp"
-                android:background="@color/gray"/>
-            <com.kfzs.libs.widget.CompleteCommitEditText
-                android:id="@+id/edt_citic_urgent_tel"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                style="@style/citic_creditCardFontStyle"
-                android:gravity="center"
-                android:inputType="number"
-                android:hint="电话"/>
-        </LinearLayout>
-    </LinearLayout>
-
-
-    <com.kfzs.libs.widget.alpha.AlphaButton
-        android:id="@+id/btn_citic_commit"
-        style="@style/citic_creditCardBtnGradientStyle"
-        android:text="提交>" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:gravity="center"
-        android:singleLine="true"
-        android:text="中信银行版权所有 京ICP证030779-1号"
-        android:textColor="#545454"
-        android:textSize="13sp" />
-</LinearLayout>
-
-</ScrollView>

+ 0 - 8
app/src/main/res/layout/fragment_credit_card_display.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="140dp"
-    android:id="@+id/vp_credit_card_display"
-    />
-
-

+ 0 - 161
app/src/main/res/layout/frg_zx_step22.xml

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-<LinearLayout
-   android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp"
-    >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="带'*'为必填项,其他为非必填项"
-        android:textColor="#FA7200"
-        android:padding="10dp"
-        android:textSize="12sp" />
-
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <TextView
-            style="@style/creditCardInputItemTitleStyle1"
-            android:text="*单位全称:	 " />
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_name"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="请填写单位全称" />
-
-    </LinearLayout>
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <TextView
-            style="@style/creditCardInputItemTitleStyle1"
-            android:text="单位性质:" />
-
-        <android.support.v7.widget.AppCompatSpinner
-            android:id="@+id/sp_dwxz"
-            style="@style/creditCardInputItemSpinnerStyle"
-            />
-
-    </LinearLayout>
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <TextView
-            style="@style/creditCardInputItemTitleStyle1"
-            android:text="岗位性质:" />
-
-        <android.support.v7.widget.AppCompatSpinner
-            android:id="@+id/sp_gwxz"
-            style="@style/creditCardInputItemSpinnerStyle"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        style="@style/creditCardInputItemTitleStyle1"
-        android:textSize="15sp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:layout_width="match_parent"
-        android:text="*填写单位信息:" />
-
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_provence"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="省份" />
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_city"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="城市" />
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_area"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="区/县" />
-
-    </LinearLayout>
-
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <TextView
-            style="@style/creditCardInputItemTitleStyle1"
-            android:text="*单位详细地址:	 " />
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_company_address"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="单位地址信息" />
-
-    </LinearLayout>
-
-    <LinearLayout style="@style/creditCardInputItemStyle"
-        android:background="@android:color/white"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        >
-
-        <TextView
-            style="@style/creditCardInputItemTitleStyle1"
-            android:text="*单位电话:	 " />
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_tel_q"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="区号" />
-
-        <com.kfzs.libs.widget.CompleteCommitEditText
-            android:id="@+id/et_tel_no"
-            style="@style/creditCardInputItemEtStyle"
-            android:hint="电话号码" />
-
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/btn_next"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:textColor="@android:color/white"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginBottom="16dp"
-        android:layout_marginTop="16dp"
-        android:textSize="15sp"
-        android:text="下一步>"
-        android:background="#3598fe"
-        />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="中信银行版权所有 京ICP证030779-1号"
-        android:gravity="center"
-        android:textSize="10sp"
-        />
-
-</LinearLayout>
-</ScrollView>

+ 0 - 13
app/src/main/res/layout/spinner_citic_text_item.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:ellipsize="marquee"
-    android:textSize="13sp"
-    android:textColor="@android:color/black"
-    android:minHeight="30dp"
-    android:gravity="center_vertical"
-    android:textAlignment="inherit"/>

+ 0 - 13
app/src/main/res/layout/spinner_text_item.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:ellipsize="marquee"
-    android:textSize="11sp"
-    android:textColor="#b5b5b5"
-    android:minHeight="30dp"
-    android:gravity="center_vertical"
-    android:textAlignment="inherit"/>

+ 0 - 46
app/src/main/res/layout/viewpager_item_credit_card_display.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="140dp"
-    android:orientation="vertical"
-    >
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        >
-
-        <ImageView
-            android:id="@+id/iv_pre"
-            android:padding="5dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true" />
-
-        <ImageView
-            android:id="@+id/iv_card"
-            android:layout_width="144dp"
-            android:layout_height="90dp"
-            android:layout_centerInParent="true"
-            android:src="@drawable/ic_gold_credit_card_1" />
-
-
-        <ImageView
-            android:id="@+id/iv_next"
-            android:padding="5dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            />
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/tv_display_desc"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:gravity="center"
-        android:textColor="@android:color/black"
-        android:textSize="11sp" />
-</LinearLayout>

+ 0 - 2
app/src/main/res/values/dd_colors.xml

@@ -19,8 +19,6 @@
     <color name="B">#000000</color>
     <color name="main_tab_activated">#32b2ed</color>
     <color name="main_tab">#AFAFAF</color>
-    <color name="citic_tab_activated">#ffffff</color>
-    <color name="citic_tab">#848484</color>
     <color name="color_choose_head_tv_press">#ff2d4b</color>
     <color name="color_choose_head_tv">#444444</color>
 

+ 0 - 68
app/src/main/res/values/gx_strings.xml

@@ -1,73 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="digits_id_no">0123456789Xx</string>
-    <string name="digits_email">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@.</string>
 
-    <string name="desc_credit_card_normal_paint">民生in卡炫彩油画普卡(unionpay)</string>
-    <string name="desc_credit_card_normal_musical">民生in卡酷动音符普卡(unionpay)</string>
-    <string name="desc_credit_card_gold_paint">民生in卡炫彩油画金卡(unionpay)</string>
-    <string name="desc_credit_card_gold_musical">民生in卡酷动音符金卡(unionpay)</string>
-
-    <string-array name="credit_card_relationship_immediate_relatives_type">
-        <item>父母</item>
-        <item>配偶</item>
-        <item>子女</item>
-        <item>其他</item>
-    </string-array>
-    <string-array name="credit_card_relationship_other_type">
-        <item>朋友</item>
-        <item>同学</item>
-        <item>同事</item>
-        <item>其他</item>
-    </string-array>
-
-    <string-array name="credit_card_zx_tj">
-        <item>否</item>
-        <item>是</item>
-    </string-array>
-
-    <string-array name="credit_card_zx_gwxz">
-        <item> 一般员工</item>
-        <item>单位负责人级</item>
-        <item>部分负责人级</item>
-        <item>科室负责人级</item>
-    </string-array>
-    <string-array name="credit_card_zx_dwxz">
-        <item> 机关事业</item>
-        <item>国有</item>
-        <item>外商独资</item>
-        <item>合资/合作</item>
-        <item>股份制</item>
-        <item>民营</item>
-        <item>个体私营</item>
-        <item>其他</item>
-    </string-array>
-
-
-    <string-array name="credit_card_citic_family_relation">
-        <item>请选择</item>
-        <item>配偶关系</item>
-        <item>子女关系</item>
-        <item>父母关系</item>
-        <item>兄弟关系</item>
-    </string-array>
-    <string-array name="credit_card_citic_urgent_relation">
-        <item>请选择</item>
-        <item>朋友关系</item>
-        <item>同事关系</item>
-        <item>其他关系</item>
-    </string-array>
-
-    <color name="credit_blue_color">#0089ee</color>
-
-    <string name="ms_top_str">"• 申请条件\n
-1.申请主卡年龄要求18-60周岁;附属卡年龄要求16-65周岁;\n
-2.具有稳定的职业和收入,有良好的信用和还款能力(在校学生勿申请);\n
-3.目前只支持二代中国居民身份证进行网络申请。\n
-4.中信银行信用卡申请过程不收取任何费用,请警惕不法分子向您承诺可办理高额度卡片或百分百成功办卡。\n
-5.根据相关政策要求,如您已持有我行I类借记账户,您获批的中信银行借贷合一卡借记账户将为Ⅱ类账户。借记账户使用条款以我行对外公示为准。"</string>
-
-    <string name="ms_bottom_str">本人已阅读全部申请材料,充分了解并清楚和知晓该信用卡产品相关信息,愿意遵守领用合同(协议)各项规则。
-			保证预借现金仅用于合理、合规的消费领域,不得进入生产经营及证券市场,股本经营性投资及房地产开发等非消费领域。</string>
 </resources>

+ 0 - 193
app/src/main/res/values/styles.xml

@@ -25,192 +25,6 @@
 
     <!-- Base application theme. -->
 
-    <style name="creditCardStepItemStyle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:paddingTop">5dp</item>
-        <item name="android:paddingBottom">5dp</item>
-    </style>
-
-    <style name="creditCardStepItemTitleStyle">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:textColor">@color/gx_s_credit_card_step_text</item>
-    </style>
-
-    <style name="creditCardStepLineFrameStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:layout_weight">1</item>
-    </style>
-
-    <style name="creditCardStepLineStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@drawable/gx_s_bg_credit_card_step_line</item>
-        <item name="android:layout_centerVertical">true</item>
-    </style>
-
-    <style name="creditCardStepIndexStyle">
-        <item name="android:layout_width">16dp</item>
-        <item name="android:layout_height">16dp</item>
-        <item name="android:background">@drawable/gx_s_bg_credit_card_step_cycle</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textSize">8sp</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:layout_centerInParent">true</item>
-    </style>
-
-    <style name="creditCardInputGroupStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:background">@drawable/gx_bg_credit_card_white_corner</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_marginTop">@dimen/content_padding_13</item>
-    </style>
-
-    <style name="creditCardInputGroupTitleStyle">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">35dp</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="creditCardInputItemFrameStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:showDividers">middle</item>
-        <item name="android:divider">@drawable/gx_bg_line</item>
-    </style>
-    <style name="creditCardInputItemStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <style name="creditCardInputItemTitleStyle">
-        <item name="android:layout_width">70dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:textColor">#444444</item>
-    </style>
-    <style name="creditCardInputItemTitleStyle1">
-        <item name="android:layout_width">85dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:textColor">#444444</item>
-    </style>
-
-    <style name="creditCardInputItemEtStyle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:background">@null</item>
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:textColorHint">#b5b5b5</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="checkbox_creditcard_marry_style">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:textColor">#b5b5b5</item>
-        <item name="android:enabled">false</item>
-    </style>
-
-    <style name="creditCardInputItemSpinnerStyle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:background">@null</item>
-        <item name="android:textColor">#b5b5b5</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="creditCardInputItemDynamicStyle">
-        <item name="android:layout_width">65dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">#0089ee</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textSize">10sp</item>
-    </style>
-
-    <style name="creditCardBtnGradientStyle" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">35dp</item>
-        <item name="android:background">@drawable/gx_credit_card_btn_gradient_blue</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:layout_marginTop">22dp</item>
-    </style>
-    <style name="citic_creditCardBtnGradientStyle" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">55dp</item>
-        <item name="android:background">@drawable/btn_citic_commit_background</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:layout_marginTop">22dp</item>
-    </style>
-    <style name="creditCardInputItemRadiogroupStyle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <style name="creditCardInputItemRadioBtnStyle">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textColor">#b5b5b5</item>
-        <item name="android:textSize">11sp</item>
-        <item name="android:button">@drawable/gx_credit_card_radiobtn</item>
-    </style>
-
-    <style name="creditCardCardTypeBtnStyle" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">25dp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textColor">@color/gx_s_credit_card_card_type_btn_text</item>
-        <item name="android:background">@drawable/gx_s_credit_card_card_type_btn</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="creditCardDialogCloseStyle">
-        <item name="android:layout_width">20dp</item>
-        <item name="android:layout_height">20dp</item>
-        <item name="android:layout_alignParentRight">true</item>
-        <item name="android:layout_alignParentTop">true</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:paddingRight">5dp</item>
-    </style>
-
-    <style name="creditCardConfirmBtnStyle" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_width">120dp</item>
-        <item name="android:layout_height">30dp</item>
-        <item name="android:background">@drawable/gx_btn_credit_card_comfirm</item>
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:layout_marginTop">15dp</item>
-        <item name="android:layout_marginBottom">15dp</item>
-    </style>
-
     <style name="creditCardTypeItemStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -258,11 +72,4 @@
         <item name="android:layout_gravity">center_horizontal</item>
     </style>
 
-    <style name="citic_creditCardFontStyle">
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:textColorHint">#b5b5b5</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:background">@null</item>
-    </style>
-
 </resources>