挂机使用手机号

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -46,7 +46,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
     @Override
     public void onError(Throwable e) {
         Log.e("tag","MySubscriber.throwable ="+e.toString());
-        Log.e("tag","MySubscriber.throwable ="+e.getMessage());
+//        Log.e("tag","MySubscriber.throwable ="+e.getMessage());
 
         try{
             if(e instanceof Exception){

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.util;
 
 import android.content.Context;
 import android.text.ClipboardManager;
+import android.text.TextUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -224,7 +225,7 @@ public class StringUtils {
     /**
      * 功能：判断字符串出生日期是否符合正则表达式：包括年月日，闰年、平年和每月31天、30天和闰月的28天或者29天
      *
-     * @param string
+     * @param strDate
      * @return
      */
     public static boolean isDate(String strDate) {
@@ -238,7 +239,15 @@ public class StringUtils {
         }
     }
 
-
-
+    /**
+     * 验证手机格式
+     */
+    public static boolean isMobile(String number) {
+        if (TextUtils.isEmpty(number))
+            return false;
+        Pattern pattern = Pattern.compile("^1[3-9]\\d{9}$");//"^((13[0-9])|(14[5,7,9])|(15[^4])|(18[0-9])|(17[0,1,3,5,6,7,8]))\\d{8}$");
+        Matcher matcher = pattern.matcher(number);
+        return matcher.matches();
+    }
 
 }

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

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.presenter.CommitWxCodeMakeMoneyContract;
 import com.sheep.gamegroup.presenter.CommitWxCodeMakeMoneyPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -60,7 +61,9 @@ public class CommitWxCodeAct extends BaseActivity implements CommitWxCodeMakeMon
                 String account = et_wx_account.getText().toString();
                 String password = et_wx_pwd.getText().toString();
                 if(TextUtils.isEmpty(account)){
-                    G.showToast("微信账号不能为空");
+                    G.showToast("手机号不能为空");
+                } else if(!StringUtils.isMobile(account)){
+                    G.showToast("请输入正确的手机号");
                 } else if(et_wx_pwd.getVisibility() == View.VISIBLE && TextUtils.isEmpty(password)){
                     switch (type){
                         case ALTER_CODE:

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -12,37 +12,34 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 public class DialogAccountAbnormal {
 
-    private static AlertDialog mAlertDialog;
 
     public static AlertDialog showDialog(final Activity activity) {
-        if (mAlertDialog == null) {
             View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
-            ViewFindUtils.find(view, R.id.dialog_sure)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.dialog_close)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.dialog_action)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                            Jump2View.getInstance().goGuideDeArchive(activity, null);
-                        }
-                    });
-            mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                     .setView(view)
                     .create();
-        }
+        ViewFindUtils.find(view, R.id.dialog_sure)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
+        ViewFindUtils.find(view, R.id.dialog_close)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
+        ViewFindUtils.find(view, R.id.dialog_action)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        Jump2View.getInstance().goGuideDeArchive(activity, null);
+                    }
+                });
         try {
             mAlertDialog.show();
         } catch (Exception e) {

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogChooseImage.java

@@ -17,42 +17,39 @@ import static com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity.REQUEST_CO
 
 public class DialogChooseImage {
 
-    private static AlertDialog mAlertDialog;
 
     public static AlertDialog showDialog(final AbsChooseImageActivity activity) {
-        if (mAlertDialog == null) {
-            View view = View.inflate(activity, R.layout.dialog_choose_image, null);
-            ViewFindUtils.find(view, R.id.dialog_camera)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                            Intent intent = new Intent(activity, ImageGridActivity.class);
-                            intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS,true); // 是否是直接打开相机
-                            activity.startActivityForResult(intent, REQUEST_CODE_CAMERA);
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.dialog_close)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
+        View view = View.inflate(activity, R.layout.dialog_choose_image, null);
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(view)
+                .create();
+        ViewFindUtils.find(view, R.id.dialog_camera)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        Intent intent = new Intent(activity, ImageGridActivity.class);
+                        intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS,true); // 是否是直接打开相机
+                        activity.startActivityForResult(intent, REQUEST_CODE_CAMERA);
+                    }
+                });
+        ViewFindUtils.find(view, R.id.dialog_close)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
 
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.dialog_choose)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                            Intent intent = new Intent(activity, ImageGridActivity.class);
-                            activity.startActivityForResult(intent, REQUEST_CODE_SELECT);
-                        }
-                    });
-            mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
-                    .setView(view)
-                    .create();
-        }
+                    }
+                });
+        ViewFindUtils.find(view, R.id.dialog_choose)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        Intent intent = new Intent(activity, ImageGridActivity.class);
+                        activity.startActivityForResult(intent, REQUEST_CODE_SELECT);
+                    }
+                });
         Window window = mAlertDialog.getWindow();
         if(window != null) {
             WindowManager.LayoutParams params = window.getAttributes();

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogRealNameAuther.java

@@ -11,29 +11,26 @@ import com.sheep.jiuyan.samllsheep.R;
 
 public class DialogRealNameAuther {
 
-    private static AlertDialog mAlertDialog;
 
     public static AlertDialog showDialog(final Activity activity) {
-        if (mAlertDialog == null) {
-            View view = View.inflate(activity, R.layout.dialog_real_name_auther, null);
-            ViewFindUtils.find(view, R.id.dialog_sure)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                        }
-                    });
-            ViewFindUtils.find(view, R.id.dialog_close)
-                    .setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mAlertDialog.dismiss();
-                        }
-                    });
-            mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
-                    .setView(view)
-                    .create();
-        }
+        View view = View.inflate(activity, R.layout.dialog_real_name_auther, null);
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(view)
+                .create();
+        ViewFindUtils.find(view, R.id.dialog_sure)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
+        ViewFindUtils.find(view, R.id.dialog_close)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
         try {
             mAlertDialog.show();
         } catch (Exception e) {

app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -15,7 +15,6 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.view.dialog.DialogChooseImage;
 import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -27,8 +27,8 @@
                 android:background="@null"
                 android:drawablePadding="@dimen/content_padding_10"
                 android:drawableStart="@drawable/commit_wx_logo"
-                android:inputType="none"
-                android:hint="请输入要挂机的微信号"
+                android:inputType="phone"
+                android:hint="请输入手机号"
                 android:paddingLeft="20dp"
                 android:textColor="@color/black_text_deep"
                 android:textSize="@dimen/text_size_3" >