jixionghui 4 лет назад
Родитель
Сommit
fdbce1149f

+ 19 - 0
skWeiChatBaidu/src/main/java/com/liaobo/im/bean/CertificationBean.java

@@ -0,0 +1,19 @@
+package com.liaobo.im.bean;
+
+import java.io.Serializable;
+
+/**
+ * 实名认证
+ */
+public class CertificationBean implements Serializable {
+    private static final long serialVersionUID = -2065233474054951151L;
+    private boolean isCertification;
+
+    public boolean isCertification() {
+        return isCertification;
+    }
+
+    public void setCertification(boolean certification) {
+        isCertification = certification;
+    }
+}

+ 22 - 10
skWeiChatBaidu/src/main/java/com/liaobo/im/fragment/MeFragment.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.liaobo.im.AppConstant;
 import com.liaobo.im.R;
 import com.liaobo.im.Reporter;
+import com.liaobo.im.bean.CertificationBean;
 import com.liaobo.im.bean.User;
 import com.liaobo.im.broadcast.OtherBroadcast;
 import com.liaobo.im.course.LocalCourseActivity;
@@ -25,6 +26,7 @@ import com.liaobo.im.helper.AvatarHelper;
 import com.liaobo.im.pay.PaymentActivity;
 import com.liaobo.im.ui.MainActivity;
 import com.liaobo.im.ui.account.SignInActivity;
+import com.liaobo.im.ui.base.BaseChatActivity;
 import com.liaobo.im.ui.base.EasyFragment;
 import com.liaobo.im.ui.circle.BusinessCircleActivity;
 import com.liaobo.im.ui.contacts.RoomActivity;
@@ -187,10 +189,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 break;
             case R.id.my_monry:
                 // 我的钱包
-                if (!isVerified) {
-                    checkVerified();
-                    return;
-                }
+//                if (!isVerified) {
+//                    checkVerified();
+//                    return;
+//                }
                 startActivity(new Intent(getActivity(), WxPayBlance.class));
                 break;
             case R.id.my_space_rl:
@@ -330,14 +332,24 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 //        HttpUtils.get().url("http://eolinker.autu.live/server/index.php?g=Web&c=Mock&o=simple&projectID=3&uri=/user/signin/pack/info&time=1576392852&secret=44daefaa0c6c7b6f59976798f5996e7e&access_token=caaed74185504f6b835b7d90573c2aef")
                 .params(params)
                 .build()
-                .execute(new BaseCallback<String>(String.class) {
+                .execute(new BaseCallback<CertificationBean>(CertificationBean.class) {
 
                     @Override
-                    public void onResponse(ObjectResult<String> result) {
-                        if (result.getResultCode() == 1) {
-                            ToastUtil.showToast(getContext(), "实名认证已通过");
-                            isVerified = true;
-                            PreferenceUtils.putString(getContext(), "isVerified", "true");
+                    public void onResponse(ObjectResult<CertificationBean> result) {
+                        if (result.getResultCode() == 1 && result.getData()!=null) {
+                            CertificationBean bean = result.getData();
+
+                            if (bean.isCertification()){
+                                isVerified = true;
+                                ToastUtil.showToast(getContext(), "实名认证已通过");
+                                PreferenceUtils.putString(getContext(), "isVerified", "true");
+                            }else {
+                                ToastUtil.showToast(getActivity(), result.getResultMsg());
+
+                            }
+
+
+
 //                            startActivity(new Intent(getActivity(), SignInActivity.class));
                         }
                     }

+ 13 - 4
skWeiChatBaidu/src/main/java/com/liaobo/im/ui/base/BaseChatActivity.java

@@ -3,6 +3,7 @@ package com.liaobo.im.ui.base;
 import android.text.TextUtils;
 
 import com.liaobo.im.R;
+import com.liaobo.im.bean.CertificationBean;
 import com.liaobo.im.ui.dialog.VerifiedDialogView;
 import com.liaobo.im.util.PreferenceUtils;
 import com.liaobo.im.util.ToastUtil;
@@ -40,14 +41,22 @@ public abstract class BaseChatActivity extends BaseActivity implements
         HttpUtils.get().url(coreManager.getConfig().MAKE_VERIFIED)
                 .params(params)
                 .build()
-                .execute(new BaseCallback<String>(String.class) {
+                .execute(new BaseCallback<CertificationBean>(CertificationBean.class) {
 
                     @Override
-                    public void onResponse(ObjectResult<String> result) {
-                        if (result.getResultCode() == 1) {
+                    public void onResponse(ObjectResult<CertificationBean> result) {
+                        CertificationBean certificationBean = result.getData();
+                        if (result.getResultCode() == 1 && certificationBean!=null) {
+                            if (certificationBean.isCertification()){
+                                ToastUtil.showToast(getApplicationContext(), "实名认证已通过");
+                                PreferenceUtils.putString(getApplicationContext(), "isVerified", "true");
+                            }else {
+                                ToastUtil.showToast(getApplicationContext(), result.getResultMsg());
+
+                            }
 
                             ToastUtil.showToast(BaseChatActivity.this, getApplicationContext().getString(R.string.success));
-                            PreferenceUtils.putString(BaseChatActivity.this, "isVerified", "true");
+
                         }else {
 
                             ToastUtil.showToast(BaseChatActivity.this, result.getResultMsg());

+ 4 - 0
skWeiChatBaidu/src/main/java/com/liaobo/im/util/ToastUtil.java

@@ -1,6 +1,7 @@
 package com.liaobo.im.util;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import com.liaobo.im.R;
@@ -40,6 +41,9 @@ public class ToastUtil {
         if (context == null) {
             return;
         }
+        if (TextUtils.isEmpty(message)) {
+            return;
+        }
         if (message.equals("请授权后再试")){
             return;
         }