民生银行使用web

app/src/main/AndroidManifest.xml

@@ -384,6 +384,7 @@
 
         <activity android:name="com.sheep.groups.creditcard.zx.ZhongXinCreditStep1Activity" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.groups.creditcard.ms.MinShengCreditActivity" android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActMingShengWeb"  android:screenOrientation="portrait"/>
         <!--友盟start-->
 
 

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

@@ -10,6 +10,7 @@ import android.webkit.WebView;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.libs.widget.loading.SupportLoadingFragment;
 import com.kfzs.libs.widget.navigation.NavigationBar;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.groups.creditcard.ms.MinShengCreditActivity;
 import com.sheep.groups.creditcard.zx.ZhongXinCreditStep1Activity;
 import com.sheep.jiuyan.samllsheep.R;
@@ -45,9 +46,9 @@ public class FgtCreditCard extends SupportLoadingFragment{
     @OnClick({R.id.btn_ms,R.id.btn_zx})
     public void onClick(View view){
         if(R.id.btn_ms == view.getId()){
-            startActivity(new Intent(getActivity(), MinShengCreditActivity.class));
-        }
-        else if(R.id.btn_zx == view.getId()){
+//            startActivity(new Intent(getActivity(), MinShengCreditActivity.class));
+            Jump2View.getInstance().goMingShengWeb(getActivity(), null);
+        }else if(R.id.btn_zx == view.getId()){
             startActivity(new Intent(getActivity(), ZhongXinCreditStep1Activity.class));
         }
     }

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

@@ -1,17 +1,13 @@
 package com.kfzs.duanduan.react;
 
 import android.support.v4.app.Fragment;
-import android.widget.ImageView;
 
 import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.fragment.FgtBorrowPlay;
 import com.kfzs.duanduan.fragment.FgtCreditCard;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
-import com.sheep.groups.creditcard.ApplyForCardTabFragment;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.VipStyle;
 import com.kfzs.duanduan.fragment.FgtMainCategory;
 import com.kfzs.duanduan.fragment.FgtMainGame;
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
+import com.sheep.jiuyan.samllsheep.R;
 
 /**
  * Created by realicing on 2018/1/4.

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
+import com.sheep.gamegroup.view.activity.ActMingShengWeb;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
@@ -241,6 +242,19 @@ public class Jump2View {
         context.startActivity(intent);
     }
     /**
+     * 跳到民生银行web页面
+     * @param context
+     * @param o
+     */
+    public void goMingShengWeb(Context context, Object o){
+        Intent intent = new Intent(context, ActMingShengWeb.class);
+//        extraUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_URL);
+//        extraTitle = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE);
+        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, "https://qiniu.kuaifazs.com/jiefeng.html");
+        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, "解封引导");
+        context.startActivity(intent);
+    }
+    /**
      * 跳到提交微信号挂机赚钱界面
      * @param context
      * @param o

app/src/main/java/com/sheep/gamegroup/view/activity/ActMingShengWeb.java

@@ -0,0 +1,118 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.TextView;
+
+import com.kfzs.android.view.widget.SafeWebView;
+import com.kfzs.duanduan.BaseCompatActivity;
+import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.orhanobut.logger.Logger;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
+
+/**
+ * 民生银行信用卡申请web
+ * Created by zengjiebin on 2018/4/11.
+ */
+public class ActMingShengWeb extends BaseCompatActivity {
+
+    @BindView(R.id.webview)
+    SafeWebView mWebView;
+    @BindView(R.id.tv_next)
+    TextView tv_next;
+
+    private String extraUrl;
+    private String extraTitle;
+    private WebSettings webViewSettings;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_guide_on_hook);
+
+        extraUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_URL);
+        extraTitle = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE);
+
+        ButterKnife.bind(this);
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, extraTitle)
+                .setTitleFinish(this);
+
+        webViewSettings = mWebView.getSettings();
+        webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
+        mWebView.autoSettingWebViewDefaultByWideViewPort(this, false);
+        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
+            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
+        }
+        tv_next.setVisibility(View.GONE);
+        loadUrl();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mWebView.setVisibility(View.GONE);
+        mWebView.removeAllViews();
+        mWebView.destroy();
+    }
+
+    private void loadUrl() {
+        Logger.d("loadUrl: " + extraUrl);
+        mWebView.setWebChromeClient(new WebChromeClient());
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                try {
+                    view.loadUrl(url);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return true;
+            }
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                injectImgClick();
+            }
+        });
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.addJavascriptInterface(new Object(){
+            @JavascriptInterface
+            public void openImage(int i, String src) {
+
+            }
+        }, "toolbox");
+        mWebView.loadUrl(extraUrl);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(mWebView.canGoBack()){
+            mWebView.goBack();
+            return;
+        }
+        this.finish();
+    }
+    // 注入js函数监听
+    public void injectImgClick() {
+        mWebView.loadUrl("javascript:(function(){})()");
+    }
+
+}

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

@@ -20,7 +20,7 @@ import butterknife.BindView;
  * Created by guoxin on 2018/4/3.
  */
 
-public class ApplyForCardTabFragment extends SupportLoadingFragment implements OnNextStepCallback,ApplyForCreditCardCommitFragment.OnLastCommitCallback{
+public class ApplyForCardTabFragment extends SupportLoadingFragment implements OnNextStepCallback {
 
     protected final String TAG = this.getClass().getCanonicalName();
     public static final int STEP_BASICS = 0;
@@ -46,20 +46,8 @@ public class ApplyForCardTabFragment extends SupportLoadingFragment implements O
 
     @Override
     public void setupViews(@Nullable 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();
-
+//        openBasic(savedInstanceState);
+        openDetails();
     }
 
     @Override
@@ -73,13 +61,27 @@ public class ApplyForCardTabFragment extends SupportLoadingFragment implements O
                 openCommit();
                 break;
             case STEP_COMMIT:
-                llStep3.setSelected(false);
-                getChildFragmentManager().popBackStackImmediate(ApplyForCreditCardCommitFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                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);
 
@@ -106,7 +108,6 @@ public class ApplyForCardTabFragment extends SupportLoadingFragment implements O
         if (commitFragment == null) {
             commitFragment = new ApplyForCreditCardCommitFragment();
             commitFragment.setOnNextStepCallback(this);
-            commitFragment.setOnLastCommitCallback(this);
         }
 
         getChildFragmentManager()
@@ -116,8 +117,7 @@ public class ApplyForCardTabFragment extends SupportLoadingFragment implements O
                 .commit();
     }
 
-    @Override
-    public void lastCommit() {
+    private void lastCommit() {
         llStep3.setSelected(false);
         getChildFragmentManager().popBackStackImmediate(ApplyForCreditCardCommitFragment.class.getSimpleName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
         llStep2.setSelected(false);

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

@@ -26,6 +26,7 @@ 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;
@@ -136,7 +137,7 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
 
     @Override
     public void setupViews(@Nullable Bundle savedInstanceState) {
-
+        test();
         if(normalCardDisplayFragment == null){
             normalCardDisplayFragment = CreditCardDisplayFragment.newInstance(CreditCardDisplayFragment.CARD_TYPE_NORMAL);
         }
@@ -445,7 +446,13 @@ public class ApplyForCreditCardBasicInfoFragment extends DaggerFragment implemen
             ds.setUnderlineText(false);    //去除超链接的下划线
         }
     }
-
+    private void test(){
+        if(BuildConfig.DEBUG){
+            etName.setText("曾杰斌");
+            etMobile.setText("13880742867");
+            etIdNo.setText("513822198806077711");
+        }
+    }
 
 
 }

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

@@ -1,23 +1,22 @@
 package com.sheep.groups.creditcard;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.TextView;
-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.kfzs.libs.widget.alpha.AlphaButton;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -28,7 +27,7 @@ import butterknife.Unbinder;
  * Created by guoxin on 2018/4/2.
  */
 
-public class ApplyForCreditCardCommitFragment extends DaggerFragment implements DetailsContact.View{
+public class ApplyForCreditCardCommitFragment extends DaggerFragment implements ModifyContact.View {
 
 
     @BindView(R.id.edit_card_time)
@@ -71,6 +70,8 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
     CheckBox cbxExpireLong;
 
 
+    @Inject
+    ModifyPresenter presenter;
     private Unbinder unbinder;
 
     private OnNextStepCallback onNextStepCallback;
@@ -92,17 +93,17 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
 
     @Override
     public void setupDaggerComponent() {
-
+        DaggerModifyComponent.builder().httpComponent(SheepApp.getInstance().getHttpComponent()).build().inject(this);
     }
 
     @Override
     public IPresenter currentPresenter() {
-        return null;
+        return presenter;
     }
 
     @Override
     public IView currentIView() {
-        return null;
+        return this;
     }
 
     @Override
@@ -115,11 +116,10 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
 
         CreditCardInfosManager manager = CreditCardInfosManager.getInstance();
         //身份证日期
-        if(TextUtils.equals(manager.o_id_expire,CreditCardInfosManager.EXPIRE_LONG)){
+        if (TextUtils.equals(manager.o_id_expire, CreditCardInfosManager.EXPIRE_LONG)) {
             cbxExpireLong.setChecked(true);
             editCardTime.setVisibility(View.GONE);
-        }
-        else {
+        } else {
             cbxExpireLong.setChecked(false);
             editCardTime.setVisibility(View.VISIBLE);
             editCardTime.setText(CreditCardInfosManager.getInstance().o_id_expire);
@@ -130,11 +130,10 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         editEmail.setText(CreditCardInfosManager.getInstance().p_email);
         //婚姻
         String marray = CreditCardInfosManager.getInstance().p_marray;
-        if(TextUtils.equals(CreditCardInfosManager.MARRY_Y,marray)){
+        if (TextUtils.equals(CreditCardInfosManager.MARRY_Y, marray)) {
             cbxMarryYes.setChecked(true);
             cbxMarryNo.setChecked(false);
-        }
-        else {
+        } else {
             cbxMarryYes.setChecked(false);
             cbxMarryNo.setChecked(true);
         }
@@ -147,8 +146,8 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         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)){
+        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);
@@ -184,14 +183,10 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         unbinder.unbind();
     }
 
-    @OnClick({R.id.btn_modify_infos,R.id.btn_commit_info})
-    public void onClick(View view){
-        switch (view.getId()){
+    @OnClick({R.id.btn_commit_info})
+    public void onClick(View view) {
+        switch (view.getId()) {
             case R.id.btn_commit_info:
-                Toast.makeText(activity,"申请成功",Toast.LENGTH_SHORT).show();
-                onLastCommitCallback.lastCommit();
-                break;
-            case R.id.btn_modify_infos:
                 goNext();
                 break;
         }
@@ -212,13 +207,13 @@ public class ApplyForCreditCardCommitFragment extends DaggerFragment implements
         onNextStepCallback.onNextStep(ApplyForCardTabFragment.STEP_COMMIT);
     }
 
-    OnLastCommitCallback onLastCommitCallback;
-
-    public void setOnLastCommitCallback(OnLastCommitCallback onLastCommitCallback) {
-        this.onLastCommitCallback = onLastCommitCallback;
-    }
-
-    public interface OnLastCommitCallback{
-        void lastCommit();
-    }
+//    OnLastCommitCallback onLastCommitCallback;
+//
+//    public void setOnLastCommitCallback(OnLastCommitCallback onLastCommitCallback) {
+//        this.onLastCommitCallback = onLastCommitCallback;
+//    }
+//
+//    public interface OnLastCommitCallback{
+//        void lastCommit();
+//    }
 }

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

@@ -19,18 +19,22 @@ 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;
@@ -149,6 +153,7 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 
     @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);
@@ -181,9 +186,40 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
                 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(etEducation,"p_edu");
         setOnCompleteEdit(etCompanyName,"w_name");
         setOnCompleteEdit(etCompanyCity,"w_city");
         setOnCompleteEdit(etCompanyAddress,"w_address");
@@ -276,29 +312,33 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
 
 
     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);
+//        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);
 
     }
 

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

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

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

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

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

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

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -53,7 +53,6 @@ public class SheepApp extends BaseApplication {
         initGoble();
         Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
         initNet();
-        httpComponent = DaggerHttpComponent.builder().httpModule(new HttpModule()).build();
     }
 
     public HttpComponent getHttpComponent() {
@@ -74,9 +73,8 @@ public class SheepApp extends BaseApplication {
 
 
     private void initNet() {
-        netComponent = DaggerNetComponent.builder()
-                .netModule(new NetModule())
-                .build();
+        netComponent = DaggerNetComponent.builder().netModule(new NetModule()).build();
+        httpComponent = DaggerHttpComponent.builder().httpModule(new HttpModule()).build();
     }
 
     private void regWx() {

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

@@ -283,17 +283,18 @@
             android:textColor="#b5b5b5"
             android:textSize="11sp"
             android:gravity="center"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="@dimen/content_padding_20"
             />
         <TextView
             android:id="@+id/btn_commit_info"
             style="@style/style_button"
-            android:text="提交信息" />
+            android:text="提交申请" />
 
         <TextView
             android:id="@+id/btn_modify_infos"
             style="@style/style_button"
-            android:text="修改提交信息" />
+            android:text="修改提交信息"
+            android:visibility="gone"/>
 
     </LinearLayout>
 

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

@@ -125,7 +125,7 @@
                         style="@style/creditCardInputItemTitleStyle"
                         android:text="单位名称" />
 
-                    <com.kfzs.libs.widget.CompleteCommitEditText
+                    <com.kfzs.libs.widget.TimeEditText
                         android:id="@+id/et_company_name"
                         style="@style/creditCardInputItemEtStyle"
                         android:hint="请填写单位名称，15字以内" />

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

@@ -35,6 +35,11 @@ public interface HttpService {
     @FormUrlEncoded
     @POST("credits/cmbc/extend")
     Observable<String> commitCreditCardDetails(@FieldMap Map<String, String> map);
+    //表格形式发送
+
+    @FormUrlEncoded
+    @POST("credits/cmbc/modify")
+    Observable<String> commitCreditCardModify(@FieldMap Map<String, String> map);
 
     //表格形式发送
     @FormUrlEncoded

kfzslibrary/src/main/java/com/kfzs/libs/widget/CompleteCommitEditText.java

@@ -1,18 +1,18 @@
 package com.kfzs.libs.widget;
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.EditText;
 
 /**
  * Created by guoxin on 2018/4/2.
  */
 
-public class CompleteCommitEditText extends EditText implements TextWatcher,View.OnFocusChangeListener{
+public class CompleteCommitEditText extends AppCompatAutoCompleteTextView implements TextWatcher,View.OnFocusChangeListener{
 
     private static final String TAG = "CompleteCommitEditText";
     private String lastText = "";