银行卡信息添加实名认证限制

baseSDK/src/main/java/com/dayu/event/UserInfo.java

@@ -37,6 +37,15 @@ public class UserInfo {
     private List<Integer> roles;
     private String mobile;
     private String nickName;
+    private String identity; //身份证号
+
+    public String getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
 
     public String getNickName() {
         return nickName;

userCenter/src/main/java/com/dayu/usercenter/presenter/userinfo/UserInfoPresenter.java

@@ -4,9 +4,9 @@ import android.databinding.ObservableField;
 
 import com.dayu.base.api.APIService;
 import com.dayu.base.api.Api;
+import com.dayu.base.api.protocol.AddressInfoBean;
 import com.dayu.event.UserInfo;
 import com.dayu.usercenter.api.UserService2;
-import com.dayu.base.api.protocol.AddressInfoBean;
 import com.dayu.usercenter.model.bean.UserBankInfoBean;
 import com.dayu.usercenter.model.bean.UserInfoBean;
 import com.dayu.utils.UserManager;
@@ -21,7 +21,7 @@ public class UserInfoPresenter extends UserInfoContract.Presenter {
     public ObservableField<UserInfoBean> info = new ObservableField<>();
     public ObservableField<UserBankInfoBean> bankInfo = new ObservableField<>();
     public ObservableField<AddressInfoBean> addressInfo = new ObservableField<>();
-//    public ObservableField<Boolean> status = new ObservableField<>();
+    //    public ObservableField<Boolean> status = new ObservableField<>();
     private int mAccountId;
     private int mDetectStatus;
 
@@ -53,33 +53,51 @@ public class UserInfoPresenter extends UserInfoContract.Presenter {
 //                    }
 //                }));
         mView.showDialog();
-        Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers())
-                .subscribe(baseObserver(data->
-                    info.set(data)
-                ));
+        getUserInfo(accountId);
         getBankInfo();
         getAddrInfo();
 
         //星级佣金
         Api.getService(UserService2.class).getStarRatios().compose(Api.applySchedulers())
-                .subscribe(baseObserver(datas->mView.setStarRatioData(datas)));
+                .subscribe(baseObserver(datas -> mView.setStarRatioData(datas)));
         //佣金比率
         Api.getService(UserService2.class).getGlobelRate(1).compose(Api.applySchedulers())
-                .subscribe(baseObserver(data->mView.setGlobelRate(data)));
+                .subscribe(baseObserver(data -> mView.setGlobelRate(data)));
+    }
+
+    public void getUserInfo(int accountId) {
+        Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers())
+                .subscribe(baseObserver(data -> {
+                            saveUserInfo(data);
+                            info.set(data);
+                        }
+                ));
+    }
+
+    //保存用户信息
+    private void saveUserInfo(UserInfoBean info) {
+        UserInfo userInfo = UserManager.getInstance().getUser();
+        if (userInfo != null) {
+            userInfo.setAccountName(info.getRealName());
+            userInfo.setHeaderImg(info.getAccountUrl());
+            userInfo.setIdentity(info.getIdentity());
+            UserManager.getInstance().saveUser(userInfo);
+        }
     }
 
     public void getBankInfo() {
         Api.getService(UserService2.class).getUserBankInfo(mAccountId).compose(Api.applySchedulers())
-                .subscribe(baseObserver(data->
+                .subscribe(baseObserver(data ->
                         bankInfo.set(data)
                 ));
     }
+
     public void getAddrInfo() {
         Api.getService(APIService.class).getAddressInfo(mAccountId).compose(Api.applySchedulers())
-                .subscribe(baseObserver(data->{
+                .subscribe(baseObserver(data -> {
                             addressInfo.set(data);
-                            detailAddress.set(data.getProvinceName()+" "+data.getCityName()
-                                    +" "+data.getDistrictName()+" "+data.getAddress());
+                            detailAddress.set(data.getProvinceName() + " " + data.getCityName()
+                                    + " " + data.getDistrictName() + " " + data.getAddress());
 
                         }
                 ));

userCenter/src/main/java/com/dayu/usercenter/ui/activity2/EditBankActivity.java

@@ -41,6 +41,7 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit
     public void initView() {
         initUser();
         mBind.titleBack.setOnClickListener(view -> dumpBack());
+        mBind.edtBankHolder.setText(mUserInfo.getAccountName());
         initData();
 
         addEdtListener(mBind.edtBankName);
@@ -79,7 +80,8 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit
         bankName = mBind.edtBankName.getText().toString().trim();
         bankAccount = mBind.edtBankAccount.getText().toString().trim();
         bankHolder = mBind.edtBankHolder.getText().toString().trim();
-        boolean canSubmit = !TextUtils.isEmpty(bankName) && !TextUtils.isEmpty(bankAccount) && !TextUtils.isEmpty(bankHolder);
+        boolean canSubmit = !TextUtils.isEmpty(bankName) && !TextUtils.isEmpty(bankAccount)
+                && !TextUtils.isEmpty(bankHolder) && mUserInfo.getAccountName().equals(bankHolder);
         changeBtnstate(canSubmit);
     }
 

userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserInfoActivity.java

 package com.dayu.usercenter.ui.activity2;
 
 import android.graphics.Color;
+import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.text.Html;
+import android.text.TextUtils;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.dayu.base.ui.activity.BaseActivity;
+import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
+import com.dayu.provider.event.CertificationEvent;
+import com.dayu.provider.router.RouterPath;
 import com.dayu.usercenter.R;
 import com.dayu.usercenter.databinding.ActivityUserInfoBinding;
 import com.dayu.usercenter.event.EditAddressEvent;
@@ -20,8 +26,10 @@ import com.dayu.usercenter.presenter.userinfo.UserInfoPresenter;
 import com.dayu.usercenter.ui.activity.PersonInfoActivity;
 import com.dayu.utils.CommonUtils;
 import com.dayu.utils.UserManager;
+import com.dayu.widgets.CustomDialog;
 
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.List;
 
@@ -46,11 +54,36 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
     public void initView() {
         setUserRule2(globelRate+"%");
         mBind.rlUser.setOnClickListener(view -> startActivity(PersonInfoActivity.class));
-        mBind.rlBank.setOnClickListener(view -> startActivity(EditBankActivity.class));
+        mBind.rlBank.setOnClickListener(view -> toEditBank());
         mBind.rlAddress.setOnClickListener(view -> startActivity(EditAddressActivity.class));
         mBind.tvHotLine.setOnClickListener(view -> CommonUtils.dialPhone(this,getString(R.string.customer_hot_line2)));
     }
 
+    private void toEditBank() {
+        initUser();
+        if (TextUtils.isEmpty(mUserInfo.getIdentity())) {
+            showCertificationDialog();
+            return;
+        }
+        startActivity(EditBankActivity.class);
+    }
+
+    //提示去认证身份
+    private void showCertificationDialog() {
+        CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite)
+                , (dialog, confirm) -> {
+            if (confirm) {
+                Bundle bundle = new Bundle();
+                bundle.putInt(Constants.CETIFICATION_STATE, 1);
+                ARouter.getInstance().build(RouterPath.PATH_CERTIFICAITON).withBundle(Constants.BUNDLE, bundle).navigation();
+            }
+        });
+        customDialog.setTitle(getString(R.string.certification))
+                .setPositiveButton(getString(R.string.go_certification))
+                .setNegativeButton(getString(R.string.cancle));
+        customDialog.show();
+    }
+
     private void setUserRule2(String rulr2) {
         String str = getString(R.string.user_info_rule2_1)+"<font color='#3e96e2'>"+rulr2+
                 "</font>"+getString(R.string.user_info_rule2_2);
@@ -134,4 +167,10 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
         showDialog();
         mPresenter.getAddrInfo();
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void certifiCation(CertificationEvent event) {
+        initUser();
+        mPresenter.getUserInfo(mUserId);
+    }
 }

userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java

@@ -221,6 +221,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
             userInfo.setAccountName(info.getRealName());
             userInfo.setHeaderImg(info.getAccountUrl());
             userInfo.setNickName(info.getNickName());
+            userInfo.setIdentity(info.getIdentity());
             userInfo.setLiveStatus(info.getLiveStatus());
             userInfo.setLianmaiStatus(info.getLianmaiStatus());
             UserManager.getInstance().saveUser(userInfo);

userCenter/src/main/res/layout/activity_edit_bank.xml

@@ -78,7 +78,14 @@
         <TextView
             style="@style/common_text_style"
             android:textColor="@color/common_red"
-            android:layout_margin="15dp"
+            android:layout_marginLeft="10dp"
+            android:textSize="14sp"
+            android:layout_marginTop="5dp"
+            android:text="注：银行卡开户人需和实名认证人一致" />
+        <TextView
+            style="@style/common_text_style"
+            android:textColor="@color/common_red"
+            android:layout_margin="10dp"
             android:text="@string/fill_bank_notice" />
 
         <View