身份验证修改为只验证姓名与身份证

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

@@ -33,9 +33,6 @@ import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
-import com.sheep.gamegroup.event.ImageHeadChange;
-import com.sheep.gamegroup.event.MoneyChange;
-import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BulletinEnty;
 import com.sheep.gamegroup.model.entity.Ext;
@@ -82,7 +79,6 @@ import com.youth.banner.loader.ImageLoader;
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -778,33 +774,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(UserNameChange done) {
-        UserEntity enity = userEntity;
-        enity.setNickname(done.getNikeName());
-        userEntity = enity;
-        loadUserInfo();
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(MoneyChange done) {
-        UserEntity enity = userEntity;
-        enity.setBalance(done.getBalance());
-        enity.setTotal_asset(done.getTotal_asset());
-        userEntity = enity;
-        loadUserInfo();
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(ImageHeadChange done) {
-        UserEntity enity = userEntity;
-        enity.setAvatar(done.getAvatar());
-        userEntity = enity;
-        loadUserInfo();
-    }
-
-
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/sheep/gamegroup/event/ImageHeadChange.java

@@ -1,17 +0,0 @@
-package com.sheep.gamegroup.event;
-
-/**
- * Created by Administrator on 2018/3/27.
- */
-
-public class ImageHeadChange {
-    private  String avatar;
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-}

app/src/main/java/com/sheep/gamegroup/event/MoneyChange.java

@@ -1,27 +0,0 @@
-package com.sheep.gamegroup.event;
-
-/**
- * Created by Administrator on 2018/3/27.
- */
-
-public class MoneyChange {
-
-    private  String balance;
-    private  String  total_asset;
-
-    public String getBalance() {
-        return balance;
-    }
-
-    public void setBalance(String balance) {
-        this.balance = balance;
-    }
-
-    public String getTotal_asset() {
-        return total_asset;
-    }
-
-    public void setTotal_asset(String total_asset) {
-        this.total_asset = total_asset;
-    }
-}

app/src/main/java/com/sheep/gamegroup/event/RealNameAutehrChange.java

@@ -1,35 +0,0 @@
-package com.sheep.gamegroup.event;
-
-/**
- * Created by Administrator on 2018/3/26.
- */
-
-public class RealNameAutehrChange {
-    private  String  realName;
-    private  String  idCard;
-    private  String  banck;
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getBanck() {
-        return banck;
-    }
-
-    public void setBanck(String banck) {
-        this.banck = banck;
-    }
-}

app/src/main/java/com/sheep/gamegroup/event/UserNameChange.java

@@ -1,17 +0,0 @@
-package com.sheep.gamegroup.event;
-
-/**
- * Created by Administrator on 2018/3/26.
- */
-
-public class UserNameChange {
-    String  nikeName;
-
-    public String getNikeName() {
-        return nikeName;
-    }
-
-    public void setNikeName(String nikeName) {
-        this.nikeName = nikeName;
-    }
-}

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

@@ -148,21 +148,14 @@ public class DataUtil {
         return "";
     }
 
-    /**
-     * 获取当前用户的微信昵称
-     *
-     * @return
-     */
-    public String getUserWxNicknName() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null && userEntity.getWx_nickname() != null)
-            return userEntity.getWx_nickname();
-        return "";
-    }
+    public void setUserNickName(String nickname) {
+        if (userEntity != null)
+            userEntity.setNickname(nickname);
 
-    public void setUserWxNickName(String wx_nickname) {
+    }
+    public void setUserAvatar(String avatar) {
         if (userEntity != null)
-            userEntity.setWx_nickname(wx_nickname);
+            userEntity.setAvatar(avatar);
 
     }
 

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

@@ -262,6 +262,12 @@ public class StringUtils {
         Matcher matcher = pattern.matcher(number);
         return matcher.matches();
     }
+    // 校验中文
+    public static boolean isChinese(String name) {
+        Pattern p = Pattern.compile("^[\u4E00-\u9FA50]+$");
+        Matcher m = p.matcher(name);
+        return m.matches();
+    }
 
     /**
      * 格式化json

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

@@ -10,12 +10,10 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
-import com.sheep.gamegroup.event.ImageHeadChange;
-import com.sheep.gamegroup.event.MoneyChange;
-import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.AppUtil;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
@@ -25,9 +23,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -96,65 +91,8 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
         if (userEntity != null) {
-            personal_info_name.setText(userEntity.getNickname());
-            personal_info_code.setText(userEntity.getInvitation_code());
-
-            Glide.with(PersonalInfoAct.this)
-                    .load(AppUtil.getQRLink(userEntity.getShareLink(), 90))
-                    .into(personal_info_qr);
-            GlideImageLoader.setAvatar(personal_info_avatar, userEntity.getAvatar());
-            //账号与安全
-
-            if (TextUtils.isEmpty(userEntity.getMobile())) {
-                personal_info_phone.setText("未绑定");
-            } else {
-                personal_info_phone.setText(userEntity.getMobile());
-                DataUtil.getInstance().setUserMobile(userEntity.getMobile());
-            }
-
-            if (TextUtils.isEmpty(userEntity.getWx_nickname())) {
-                if (TextUtils.isEmpty(userEntity.getWx_openid())) {
-                    personal_info_wx.setText("未绑定");
-                } else {
-                    personal_info_wx.setText("");
-                }
-            } else {
-                personal_info_wx.setText(userEntity.getWx_nickname());
-            }
-
-            refalshAuther(userEntity);
-            MoneyChange change = new MoneyChange();
-            change.setBalance(userEntity.getBalance() + "");
-            change.setTotal_asset(userEntity.getTotal_asset() + "");
+            loadUserInfo();
         }
-
-
-        EventBus.getDefault().register(this);
-
-    }
-
-    private void refalshAuther(UserEntity entity) {
-        boolean isBanck = TextUtils.isEmpty(entity.getBank_card());
-        boolean isId_number = TextUtils.isEmpty(entity.getId_number());
-        boolean isRoalName = TextUtils.isEmpty(entity.getReal_name());
-        if (isId_number && isRoalName) {
-            personal_info_authentication.setText("未认证");
-        } else if (!isId_number && !isRoalName) {
-            personal_info_authentication.setText("已认证");
-        } else {
-            personal_info_authentication.setText("认证中");
-        }
-
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(UserNameChange done) {
-        UserEntity user = userEntity;
-        user.setNickname(done.getNikeName());
-        userEntity = user;
-        personal_info_name.setText(userEntity.getNickname());
-
     }
 
 
@@ -205,7 +143,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
     @Override
     protected void onGetImage(String path) {
-        GlideImageLoader.circleImage(personal_info_avatar, path, R.drawable.icon);
+//        GlideImageLoader.setAvatar(personal_info_avatar, path);
     }
 
     @Override
@@ -233,16 +171,66 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
     @Override
     protected void onGetNetImageUrl(String url) {
-        ImageHeadChange imageHeadChange = new ImageHeadChange();
-        imageHeadChange.setAvatar(url);
-        EventBus.getDefault().post(imageHeadChange);
-
+        DataUtil.getInstance().setUserAvatar(url);
+        GlideImageLoader.setAvatar(personal_info_avatar, url);
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
+    protected void onResume() {
+        super.onResume();
+        UserEntity result = DataUtil.getInstance().getUserEntity();
+        if(result == null) {
+            CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+                @Override
+                public void call(UserEntity item) {
+                    if(item != null) {
+                        userEntity = item;
+                        loadUserInfo();
+                    }
+                }
+            });
+        } else {
+            userEntity = result;
+            loadUserInfo();
+        }
+    }
+
+    private void loadUserInfo() {
+        personal_info_name.setText(userEntity.getNickname());
+        personal_info_code.setText(userEntity.getInvitation_code());
+
+        Glide.with(PersonalInfoAct.this)
+                .load(AppUtil.getQRLink(userEntity.getShareLink(), 90))
+                .into(personal_info_qr);
+        GlideImageLoader.setAvatar(personal_info_avatar, userEntity.getAvatar());
+        //账号与安全
+
+        if (TextUtils.isEmpty(userEntity.getMobile())) {
+            personal_info_phone.setText("未绑定");
+        } else {
+            personal_info_phone.setText(userEntity.getMobile());
+            DataUtil.getInstance().setUserMobile(userEntity.getMobile());
+        }
+
+        if (TextUtils.isEmpty(userEntity.getWx_nickname())) {
+            if (TextUtils.isEmpty(userEntity.getWx_openid())) {
+                personal_info_wx.setText("未绑定");
+            } else {
+                personal_info_wx.setText("");
+            }
+        } else {
+            personal_info_wx.setText(userEntity.getWx_nickname());
+        }
+
+        boolean isId_number = TextUtils.isEmpty(userEntity.getId_number());
+        boolean isRoalName = TextUtils.isEmpty(userEntity.getReal_name());
+        if (isId_number && isRoalName) {
+            personal_info_authentication.setText("未认证");
+        } else if (!isId_number && !isRoalName) {
+            personal_info_authentication.setText("已认证");
+        } else {
+            personal_info_authentication.setText("认证中");
+        }
     }
 
 }

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

@@ -9,17 +9,15 @@ import android.widget.TextView;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerReNameComponent;
 import com.sheep.gamegroup.di.modules.ReNameModule;
-import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.presenter.ReNameContract;
 import com.sheep.gamegroup.presenter.ReNamePresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.HashMap;
 
 import javax.inject.Inject;
@@ -96,9 +94,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
     @Override
     public void NetSuccess(int code, String msg, String string) {
         G.showToast(msg);
-        UserNameChange  name=new UserNameChange();
-        name.setNikeName(et.getText().toString());
-        EventBus.getDefault().post(name);
+        DataUtil.getInstance().setUserNickName(et.getText().toString());
         finish();
     }
 
@@ -137,7 +133,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
             return;
         }
         HashMap<String,String>  map=new HashMap<>();
-        map.put("nickname",et.getText().toString());
+        map.put("nickname", et.getText().toString());
         presenter.getTask(map);
 
     }

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

@@ -10,17 +10,13 @@ import android.widget.TextView;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerRealNameAutherComponent;
 import com.sheep.gamegroup.di.modules.RealNameAutherModule;
-import com.sheep.gamegroup.event.RealNameAutehrChange;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.RealNameAutherContract;
 import com.sheep.gamegroup.presenter.RealNameAutherPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -30,8 +26,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.HashMap;
 import java.util.Locale;
 
@@ -39,9 +33,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/26.
@@ -83,7 +75,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void initListener() {
     }
-
+    public static final int MAX_COUNT = 2;//修改为只验证身份证与姓名
     @Override
     public void initData() {
         DaggerRealNameAutherComponent.builder().netComponent(SheepApp.get(this).getNetComponent()).realNameAutherModule(new RealNameAutherModule(this)).build().inject(this);
@@ -97,7 +89,6 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         if (i != null && i.hasExtra("info")) {
             whereFrom = i.getIntExtra("where_from", 0);
         }
-        showProgress();
         tvSubmit.setVisibility(View.GONE);
         userEntity = DataUtil.getInstance().getUserEntity();
         if(userEntity != null){
@@ -122,7 +113,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
                 count = count + 1;
                 et_bank_mobile.setEnabled(false);
             }
-            if (count >= 4) {
+            if (count >= MAX_COUNT) {
                 tvSubmit.setVisibility(View.GONE);
             } else {
                 tvSubmit.setVisibility(View.VISIBLE);
@@ -140,27 +131,13 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     public void NetSuccess(int code, String msg, String string) {
         hideProgress();
         G.showToast(msg);
-        RealNameAutehrChange change = new RealNameAutehrChange();
-        for (String key : map.keySet()) {
-            if (key.equals("real_name") && !TextUtils.isEmpty(map.get(key))) {
-                change.setRealName(map.get(key));
-            }
-            if (key.equals("id_number") && !TextUtils.isEmpty(map.get(key))) {
-                change.setIdCard(map.get(key));
-            }
-            if (key.equals("bank_card") && !TextUtils.isEmpty(map.get(key))) {
-                change.setBanck(map.get(key));
-            }
-
-        }
-        EventBus.getDefault().post(change);
         updateUserInfo(new Action1<UserEntity>() {
 
             @Override
             public void call(UserEntity result) {
                 if (result != null)
                     userEntity = result;
-                    if (whereFrom == 1) {
+                    if (whereFrom == 1) {//从提现过来的
                         Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this);
                     }
                 finish();
@@ -222,13 +199,17 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         } else if (TextUtils.isEmpty((idNumber = etIdCard.getText().toString()))) {
             G.showToast("身份证不能为空");
             return;
-        } else if (TextUtils.isEmpty((bankCard = etBank.getText().toString()))) {
+        } else if (MAX_COUNT >= 4 && TextUtils.isEmpty((bankCard = etBank.getText().toString()))) {
             G.showToast("银行卡号不能为空");
             return;
-        } else if (TextUtils.isEmpty((bankCardMobile = et_bank_mobile.getText().toString()))) {
+        } else if (MAX_COUNT >= 4 && TextUtils.isEmpty((bankCardMobile = et_bank_mobile.getText().toString()))) {
             G.showToast("银行行预留手机号不能为空");
             return;
         }
+        if (!StringUtils.isChinese(realName)) {
+            G.showToast("姓名必须是基本汉字！");
+            return;
+        }
         map.put("real_name", realName);
 
         String str = StringUtils.IDCardValidate(idNumber);
@@ -237,18 +218,19 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
             return;
         }
         map.put("id_number", idNumber);
+        if (MAX_COUNT >= 4) {
+            if (!StringUtils.checkBankCard(bankCard)) {
+                G.showToast("银行卡不合法哈!");
+                return;
+            }
+            map.put("bank_card", bankCard);
 
-        if (!StringUtils.checkBankCard(bankCard)) {
-            G.showToast("银行卡不合法哈!");
-            return;
-        }
-        map.put("bank_card", bankCard);
-
-        if (!StringUtils.isMobile(bankCardMobile)) {
-            G.showToast("银行卡预留手机号不合法哈!");
-            return;
+            if (!StringUtils.isMobile(bankCardMobile)) {
+                G.showToast("银行卡预留手机号不合法哈!");
+                return;
+            }
+            map.put("bank_card_mobile", bankCardMobile);
         }
-        map.put("bank_card_mobile", bankCardMobile);
 
         ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA, "你已执行%d次实名认证操作", userEntity.getCertification_count()))
                 .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5绵羊币/次作为认证费用，请务必谨慎填写认证信息。")

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

@@ -84,12 +84,14 @@
             android:layout_height="1px"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
+            android:visibility="gone"
             android:background="@color/white_bg_line" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
+            android:visibility="gone"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -121,12 +123,14 @@
             android:layout_height="1px"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
+            android:visibility="gone"
             android:background="@color/white_bg_line" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
+            android:visibility="gone"
             android:gravity="center_vertical"
             android:orientation="horizontal">