Explorar el Código

1.移除无用代码

FailedToRead hace 3 años
padre
commit
b4f8b24404

+ 0 - 234
app/src/main/java/com/edufound/android/xyyf/activity/PhoneNumLoginActivity.java

@@ -1,234 +0,0 @@
-package com.edufound.android.xyyf.activity;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Process;
-import android.support.annotation.Nullable;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.application.EApplication;
-import com.edufound.android.xyyf.base.BaseActivity;
-import com.edufound.android.xyyf.config.AppUtils;
-import com.edufound.android.xyyf.phonelogin.PhoneLoginPersenter;
-import com.edufound.android.xyyf.phonelogin.PhoneLoginView;
-import com.edufound.android.xyyf.util.Logger;
-
-import org.json.JSONException;
-
-import java.io.IOException;
-
-public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginView {
-
-
-    PhoneLoginPersenter mPersenter;
-    Activity mActivity;
-    final int COUNT_DOWN = 0x5564;
-    EditText phone_number;
-    EditText intpu_verifaction;
-    TextView phonenumber_getverifcation;
-    TextView phonenumber_login;
-    TextView change_text;
-    int countDownNum = 60;
-    int oldWidth = -1;
-    boolean haveError = false;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.login_phonenumber);
-        setFinishOnTouchOutside(false);
-        mActivity = this;
-        mPersenter = new PhoneLoginPersenter(this);
-        init();
-    }
-
-
-    void init() {
-        phone_number = (EditText) findViewById(R.id.phonenumber_phonenumber);
-        intpu_verifaction = (EditText) findViewById(R.id.phonenumber_verifcation);
-        phonenumber_getverifcation = (TextView) findViewById(R.id.phonenumber_getverifcation);
-        phonenumber_login = (TextView) findViewById(R.id.phonenumber_login);
-        change_text = (TextView) findViewById(R.id.change_text);
-        setTextSize(phone_number, 6);
-        setTextSize(intpu_verifaction, 6);
-        setTextSize(phonenumber_getverifcation, 6);
-        setTextSize(phonenumber_login, 6);
-        change_text.setText("切换一键登录");
-        if (getIntent().getStringExtra("code") != null) {
-            change_text.setVisibility(View.GONE);
-            haveError = true;
-        }
-        LinearLayout parent = findViewById(R.id.phonenumber_page);
-        ImageView loginicon = findViewById(R.id.loginicon);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AppUtils.dp2px(this, 90), AppUtils.dp2px(this, 90));
-        params.gravity = Gravity.CENTER;
-        params.setMargins(0, AppUtils.dp2px(this, 30), 0, 0);
-        loginicon.setLayoutParams(params);
-        loginicon.setVisibility(View.VISIBLE);
-//        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-//        params.setMargins(0,  AppUtils.dp2px(this, 20), 0, AppUtils.dp2px(this, 20));
-//        parent.setLayoutParams(params);
-        change_text.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                MainActivity.getInstance().mPersenter.getJsInterfaces().showPhoneNumberLogin(2);
-                finish();
-            }
-        });
-        phonenumber_getverifcation.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //此处获取验证码
-            }
-        });
-        phonenumber_getverifcation.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN:
-                        phonenumber_getverifcation.setBackgroundResource(R.drawable.shape_login_phonenumber_getverification_selected);
-                        phonenumber_getverifcation.setTextColor(Color.WHITE);
-                        if (oldWidth <= 0) {
-                            oldWidth = phonenumber_getverifcation.getWidth();
-                        }
-                        break;
-                    case MotionEvent.ACTION_CANCEL:
-                    case MotionEvent.ACTION_UP:
-                        try {
-                            mPersenter.getVCode(phone_number.getText().toString());
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                        break;
-                }
-                return false;
-            }
-        });
-
-        phonenumber_login.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    mPersenter.LoginByVCode(phone_number.getText().toString(), intpu_verifaction.getText().toString());
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-
-    }
-
-    void setTextSize(View view, int dpsize) {
-        if (view instanceof EditText) {
-            ((EditText) view).setTextSize(AppUtils.dp2px(this, dpsize));
-        } else if (view instanceof TextView) {
-            ((TextView) view).setTextSize(AppUtils.dp2px(this, dpsize));
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        removeAllHandler();
-    }
-
-    Handler handler = new Handler(new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message msg) {
-            switch (msg.what) {
-                case COUNT_DOWN:
-                    if (countDownNum <= 0) {
-                        countDownNum = 60;
-                        phonenumber_getverifcation.setEnabled(true);
-                        phonenumber_getverifcation.setText("获取验证码");
-//                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
-                        return true;
-                    }
-                    countDownNum--;
-                    phonenumber_getverifcation.setText(String.valueOf(countDownNum + "秒后重发"));
-                    handler.sendEmptyMessageDelayed(COUNT_DOWN, 1000);
-                    break;
-            }
-            return false;
-        }
-    });
-
-    void removeAllHandler() {
-        handler.removeMessages(COUNT_DOWN);
-    }
-
-
-    @Override
-    public Activity getActivity() {
-        return mActivity;
-    }
-
-    @Override
-    public void changeVText(int type) {
-        switch (type) {
-            case 0:
-                //请求成功等待验证码
-                handler.post(new Runnable() {
-                    @Override
-                    public void run() {
-//                        mPersenter.WidthAnim(phonenumber_getverifcation, phonenumber_getverifcation.getHeight(), 500);
-                        phonenumber_getverifcation.setEnabled(false);
-                        handler.sendEmptyMessageDelayed(COUNT_DOWN, 0);
-                    }
-                });
-                break;
-            case 1:
-                handler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        phonenumber_getverifcation.setBackgroundResource(R.drawable.shape_login_phonenumber_getverification);
-                        phonenumber_getverifcation.setTextColor(Color.parseColor("#FFA301"));
-                        countDownNum = 60;
-                        phonenumber_getverifcation.setEnabled(true);
-                        phonenumber_getverifcation.setText("获取验证码");
-//                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
-                        handler.removeMessages(COUNT_DOWN);
-                    }
-                });
-                break;
-        }
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-            case KeyEvent.KEYCODE_ESCAPE:
-                Logger.e("haveError:" + haveError);
-                if (haveError) {
-                    EApplication.clearActivity();
-                    System.exit(0);
-                    android.os.Process.killProcess(Process.myPid());
-                } else {
-                    finish();
-                }
-                break;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-}

+ 0 - 45
app/src/main/java/com/edufound/android/xyyf/config/AppUtils.java

@@ -1,45 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.view.WindowManager;
-
-public class AppUtils {
-    public static int dp2px(Context context, float dipValue) {
-        try {
-            final float scale = context.getResources().getDisplayMetrics().density;
-            return (int) (dipValue * scale + 0.5f);
-        } catch (Exception e) {
-            return (int) dipValue;
-        }
-    }
-
-    public static int px2dp(Context context, float px) {
-        try {
-            final float scale = context.getResources().getDisplayMetrics().density;
-            return (int) (px / scale + 0.5f);
-        } catch (Exception e) {
-            return (int) px;
-        }
-    }
-
-    public static int getPhoneWidthPixels(Context context) {
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        DisplayMetrics var2 = new DisplayMetrics();
-        if (wm != null) {
-            wm.getDefaultDisplay().getMetrics(var2);
-        }
-
-        return var2.widthPixels;
-    }
-
-    public static int getPhoneHeightPixels(Context context) {
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        DisplayMetrics var2 = new DisplayMetrics();
-        if (wm != null) {
-            wm.getDefaultDisplay().getMetrics(var2);
-        }
-
-        return var2.heightPixels;
-    }
-}

+ 0 - 19
app/src/main/java/com/edufound/android/xyyf/config/AuthPageConfig.java

@@ -1,19 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-public interface AuthPageConfig {
-
-    /**
-     * 配置授权页样式
-     */
-    void configAuthPage();
-
-    /**
-     * android8.0兼容
-     */
-    void onResume();
-
-    /**
-     * 释放sdk内部引用,防止内存泄漏
-     */
-    void release();
-}

+ 0 - 90
app/src/main/java/com/edufound/android/xyyf/config/BaseUIConfig.java

@@ -1,90 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.graphics.Color;
-import android.util.TypedValue;
-import android.view.Surface;
-import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.edufound.android.xyyf.main.MainView;
-import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
-
-import static com.edufound.android.xyyf.config.AppUtils.dp2px;
-
-public abstract class BaseUIConfig implements AuthPageConfig {
-    public Activity mActivity;
-    public Context mContext;
-    public PhoneNumberAuthHelper mAuthHelper;
-    public int mScreenWidthDp;
-    public int mScreenHeightDp;
-
-    public static AuthPageConfig init(int type, Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
-        switch (type) {
-            case 0:
-                return new DialogLandConfig(activity, authHelper, view);
-            case 1:
-//                return new DialogLandConfigNoUI(activity, authHelper, view);
-            case 2:
-                return new FullPortConfig(activity, authHelper, view);
-        }
-        return null;
-    }
-
-    public BaseUIConfig(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
-        mActivity = activity;
-        mContext = activity.getApplicationContext();
-        mAuthHelper = authHelper;
-    }
-
-    protected void updateScreenSize(int authPageScreenOrientation) {
-        int screenHeightDp = AppUtils.px2dp(mContext, AppUtils.getPhoneHeightPixels(mContext));
-        int screenWidthDp = AppUtils.px2dp(mContext, AppUtils.getPhoneWidthPixels(mContext));
-        int rotation = mActivity.getWindowManager().getDefaultDisplay().getRotation();
-        if (authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) {
-            authPageScreenOrientation = mActivity.getRequestedOrientation();
-        }
-        if (authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                || authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-                || authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE) {
-            rotation = Surface.ROTATION_90;
-        } else if (authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-                || authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-                || authPageScreenOrientation == ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT) {
-            rotation = Surface.ROTATION_180;
-        }
-        switch (rotation) {
-            case Surface.ROTATION_0:
-            case Surface.ROTATION_180:
-                mScreenWidthDp = screenWidthDp;
-                mScreenHeightDp = screenHeightDp;
-                break;
-            case Surface.ROTATION_90:
-            case Surface.ROTATION_270:
-                mScreenWidthDp = screenHeightDp;
-                mScreenHeightDp = screenWidthDp;
-                break;
-            default:
-                break;
-        }
-    }
-
-
-    /**
-     * 在横屏APP弹竖屏一键登录页面或者竖屏APP弹横屏授权页时处理特殊逻辑
-     * Android8.0只能启动SCREEN_ORIENTATION_BEHIND模式的Activity
-     */
-    public void onResume() {
-
-    }
-
-    public void release() {
-        mAuthHelper.setAuthListener(null);
-        mAuthHelper.setUIClickListener(null);
-        mAuthHelper.removeAuthRegisterViewConfig();
-        mAuthHelper.removeAuthRegisterXmlConfig();
-    }
-}

+ 0 - 127
app/src/main/java/com/edufound/android/xyyf/config/DialogLandConfig.java

@@ -1,127 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-import android.app.Activity;
-import android.content.pm.ActivityInfo;
-import android.os.Build;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-
-import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.interfaces.JsInterfaces;
-import com.edufound.android.xyyf.main.MainView;
-import com.edufound.android.xyyf.util.Logger;
-import com.mobile.auth.gatewayauth.AuthRegisterXmlConfig;
-import com.mobile.auth.gatewayauth.AuthUIConfig;
-import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
-import com.mobile.auth.gatewayauth.ui.AbstractPnsViewDelegate;
-
-public class DialogLandConfig extends BaseUIConfig {
-
-    private int mOldScreenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-
-    MainView mView;
-
-    public DialogLandConfig(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
-        super(activity, authHelper, view);
-        mView = view;
-        Logger.e("DialogLandConfig");
-    }
-
-    @Override
-    public void configAuthPage() {
-        Logger.e("configAuthPage");
-        mAuthHelper.removeAuthRegisterXmlConfig();
-        mAuthHelper.removeAuthRegisterViewConfig();
-        int authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-        if (Build.VERSION.SDK_INT == 26) {
-            mOldScreenOrientation = mActivity.getRequestedOrientation();
-            mActivity.setRequestedOrientation(authPageOrientation);
-            authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
-        }
-        updateScreenSize(authPageOrientation);
-        final int dialogWidth = (int) (mScreenWidthDp * 0.9);
-        final int dialogHeight = (int) (mScreenHeightDp * 0.35);
-
-        //sdk默认控件的区域是marginTop50dp
-        int designHeight = dialogHeight - 60;
-        int unit = designHeight / 10;
-        int logBtnHeight = (int) (unit * 1.2);
-        final int logBtnOffsetY = unit * 3;
-
-        mAuthHelper.addAuthRegisterXmlConfig(new AuthRegisterXmlConfig.Builder()
-                .setLayout(R.layout.custom_land_dialog, new AbstractPnsViewDelegate() {
-                    @Override
-                    public void onViewCreated(View view) {
-                        findViewById(R.id.tv_title).setVisibility(View.VISIBLE);
-                        View close = findViewById(R.id.btn_close);
-                        close.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                mView.loadJSMehtodPost("closeLogin()");
-                                mAuthHelper.quitLoginPage();
-                            }
-                        });
-                        int iconTopMargin = AppUtils.dp2px(getContext(), logBtnOffsetY + 130);
-                        View iconContainer = findViewById(R.id.container_icon);
-                        RelativeLayout.LayoutParams iconLayout = (RelativeLayout.LayoutParams) iconContainer.getLayoutParams();
-                        iconLayout.topMargin = iconTopMargin;
-                        View phoneNumLogin = findViewById(R.id.changePhoneNumLogin);
-                        phoneNumLogin.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-//                                mView.getPersenter().getJsInterfaces().NOUILOGIN();
-                                mView.loadJSMehtodPost("changePhoneLogin()");
-                                mAuthHelper.quitLoginPage();
-                            }
-                        });
-
-
-//                        iconLayout.width = AppUtils.dp2px(getContext(), dialogWidth / 2 - 60);
-                    }
-                }).build());
-        showAllUi(dialogWidth, dialogHeight, authPageOrientation);
-    }
-
-
-    void showAllUi(int dialogWidth, int dialogHeight, int authPageOrientation) {
-        mAuthHelper.setAuthUIConfig(new AuthUIConfig.Builder()
-                .setNavHidden(true)
-                .setCheckboxHidden(false)
-                .setLogoHidden(true)
-                .setSloganHidden(true)
-                .setSwitchAccHidden(true)
-//                .setNumberFieldOffsetX(60)
-                .setNumberLayoutGravity(Gravity.CENTER)
-                .setNumberSize(24)
-                .setNumFieldOffsetY(20)
-                .setLogBtnOffsetY(80)
-                .setPrivacyOffsetY_B(10)
-                .setLogBtnMarginLeftAndRight(20)
-                .setLogBtnWidth(300)
-                .setLogBtnLayoutGravity(Gravity.CENTER)
-                .setLogBtnHeight(51)
-//                .setLogBtnBackgroundPath("login_btn_bg")
-                .setDialogWidth(dialogWidth)
-                .setDialogHeight(dialogHeight)
-                .setDialogBottom(false)
-//                .setAuthPageActIn("in_activity", "out_activity")
-//                .setAuthPageActOut("in_activity", "out_activity")
-                .setProtocolGravity(Gravity.CENTER_VERTICAL)
-                .setScreenOrientation(authPageOrientation)
-                .create());
-        Logger.e("showAllUi");
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Logger.e("configAuthPage  onResume");
-        if (mOldScreenOrientation != mActivity.getRequestedOrientation()) {
-            mActivity.setRequestedOrientation(mOldScreenOrientation);
-        }
-    }
-
-}

+ 0 - 106
app/src/main/java/com/edufound/android/xyyf/config/DialogLandConfigNoUI.java

@@ -1,106 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-import android.app.Activity;
-import android.content.pm.ActivityInfo;
-import android.os.Build;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-
-import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.main.MainView;
-import com.mobile.auth.gatewayauth.AuthRegisterXmlConfig;
-import com.mobile.auth.gatewayauth.AuthUIConfig;
-import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
-import com.mobile.auth.gatewayauth.ui.AbstractPnsViewDelegate;
-
-public class DialogLandConfigNoUI extends BaseUIConfig {
-
-    private int mOldScreenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-    MainView mView;
-
-    public DialogLandConfigNoUI(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
-        super(activity, authHelper, view);
-        mView = view;
-    }
-
-
-    @Override
-    public void configAuthPage() {
-        mAuthHelper.removeAuthRegisterXmlConfig();
-        mAuthHelper.removeAuthRegisterViewConfig();
-        int authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-        if (Build.VERSION.SDK_INT == 26) {
-            mOldScreenOrientation = mActivity.getRequestedOrientation();
-            mActivity.setRequestedOrientation(authPageOrientation);
-            authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
-        }
-        updateScreenSize(authPageOrientation);
-        final int dialogWidth = (int) (mScreenWidthDp * 0.9);
-        final int dialogHeight = (int) (mScreenHeightDp * 0.4);
-
-        //sdk默认控件的区域是marginTop50dp
-        int designHeight = dialogHeight - 60;
-        int unit = designHeight / 10;
-        int logBtnHeight = (int) (unit * 1.2);
-        final int logBtnOffsetY = unit * 3;
-
-        mAuthHelper.addAuthRegisterXmlConfig(new AuthRegisterXmlConfig.Builder()
-                .setLayout(R.layout.custom_land_dialog, new AbstractPnsViewDelegate() {
-                    @Override
-                    public void onViewCreated(View view) {
-                        findViewById(R.id.tv_title).setVisibility(View.VISIBLE);
-                        findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                mAuthHelper.quitLoginPage();
-                            }
-                        });
-                        int iconTopMargin = AppUtils.dp2px(getContext(), logBtnOffsetY + 130);
-                        View iconContainer = findViewById(R.id.container_icon);
-                        RelativeLayout.LayoutParams iconLayout = (RelativeLayout.LayoutParams) iconContainer.getLayoutParams();
-                        iconLayout.topMargin = iconTopMargin;
-                        View phoneNumLogin = findViewById(R.id.changePhoneNumLogin);
-//                        final FrameLayout changePhoneUi = (FrameLayout) findViewById(R.id.changePhoneFrame);
-//                        phoneNumLogin.setOnClickListener(new View.OnClickListener() {
-//                            @Override
-//                            public void onClick(View v) {
-//                                Log.e("PhoneNumberAuthDemo", "-----------NOUI---切换手机号登录------------");
-//                                mAuthHelper.quitLoginPage();
-//
-//                            }
-//                        });
-
-
-//                        iconLayout.width = AppUtils.dp2px(getContext(), dialogWidth / 2 - 60);
-                    }
-                }).build());
-        mAuthHelper.setAuthUIConfig(new AuthUIConfig.Builder()
-                .setNavHidden(true)
-                .setCheckboxHidden(true)
-                .setLogoHidden(true)
-                .setSloganHidden(true)
-                .setNavReturnHidden(true)
-                .setStatusBarHidden(true)
-                .setSwitchAccHidden(true)
-                .setLogBtnToastHidden(true)
-                .setDialogWidth(dialogWidth)
-                .setDialogHeight(dialogHeight)
-                .setDialogBottom(false)
-                .setNumberSize(0)
-                .setPrivacyTextSize(0)
-                .create());
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mOldScreenOrientation != mActivity.getRequestedOrientation()) {
-            mActivity.setRequestedOrientation(mOldScreenOrientation);
-        }
-    }
-
-}

+ 0 - 159
app/src/main/java/com/edufound/android/xyyf/config/FullPortConfig.java

@@ -1,159 +0,0 @@
-package com.edufound.android.xyyf.config;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Color;
-import android.os.Build;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSONObject;
-import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
-import com.edufound.android.xyyf.application.EApplication;
-import com.edufound.android.xyyf.main.MainView;
-import com.edufound.android.xyyf.util.Logger;
-import com.mobile.auth.gatewayauth.AuthRegisterViewConfig;
-import com.mobile.auth.gatewayauth.AuthRegisterXmlConfig;
-import com.mobile.auth.gatewayauth.AuthUIConfig;
-import com.mobile.auth.gatewayauth.AuthUIControlClickListener;
-import com.mobile.auth.gatewayauth.CustomInterface;
-import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
-import com.mobile.auth.gatewayauth.ResultCode;
-import com.mobile.auth.gatewayauth.ui.AbstractPnsViewDelegate;
-
-public class FullPortConfig extends BaseUIConfig {
-    private final String TAG = "全屏竖屏样式";
-    EditText phone_number;
-    EditText intpu_verifaction;
-    TextView phonenumber_getverifcation;
-    TextView phonenumber_login;
-    TextView change_text;
-    MainView mView;
-    int pageType = 0;//0是一键登录,1是输入手机号登录
-
-    public FullPortConfig(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
-        super(activity, authHelper, view);
-        mView = view;
-    }
-
-    @Override
-    public void configAuthPage() {
-        mAuthHelper.setUIClickListener(new AuthUIControlClickListener() {
-            @Override
-            public void onClick(String s, Context context, String s1) {
-                switch (s) {
-                    //点击授权页默认样式的返回按钮
-                    case ResultCode.CODE_ERROR_USER_CANCEL:
-                        Logger.e("CODE_ERROR_USER_CANCEL");
-                        mAuthHelper.quitLoginPage();
-                        mActivity.finish();
-                        break;
-                    //点击授权页默认样式的切换其他登录方式 会关闭授权页
-                    //如果不希望关闭授权页那就setSwitchAccHidden(true)隐藏默认的  通过自定义view添加自己的
-                    case ResultCode.CODE_ERROR_USER_SWITCH:
-                        Logger.e("CODE_ERROR_USER_SWITCH");
-                        return;
-                    //点击一键登录按钮会发出此回调
-                    //当协议栏没有勾选时 点击按钮会有默认toast 如果不需要或者希望自定义内容 setLogBtnToastHidden(true)隐藏默认Toast
-                    //通过此回调自己设置toast
-                    case ResultCode.CODE_ERROR_USER_LOGIN_BTN:
-                        Logger.e("CODE_ERROR_USER_LOGIN_BTN:" + s1);
-
-                        break;
-                    //checkbox状态改变触发此回调
-                    case ResultCode.CODE_ERROR_USER_CHECKBOX:
-                        Logger.e("CODE_ERROR_USER_CHECKBOX");
-                        break;
-                    //点击协议栏触发此回调
-                    case ResultCode.CODE_ERROR_USER_PROTOCOL_CONTROL:
-                        Logger.e("CODE_ERROR_USER_PROTOCOL_CONTROL");
-                        break;
-                    default:
-                        break;
-
-                }
-            }
-
-
-        });
-        mAuthHelper.removeAuthRegisterXmlConfig();
-        mAuthHelper.removeAuthRegisterViewConfig();
-        mAuthHelper.addAuthRegisterXmlConfig(new AuthRegisterXmlConfig.Builder()
-                .setLayout(R.layout.login_phonenumber, new AbstractPnsViewDelegate() {
-                    @Override
-                    public void onViewCreated(final View view) {
-                        phone_number = (EditText) findViewById(R.id.phonenumber_phonenumber);
-                        intpu_verifaction = (EditText) findViewById(R.id.phonenumber_verifcation);
-                        phonenumber_getverifcation = (TextView) findViewById(R.id.phonenumber_getverifcation);
-                        phonenumber_login = (TextView) findViewById(R.id.phonenumber_login);
-                        change_text = (TextView) findViewById(R.id.change_text);
-                        phone_number.setVisibility(View.INVISIBLE);
-                        intpu_verifaction.setVisibility(View.INVISIBLE);
-                        phonenumber_getverifcation.setVisibility(View.INVISIBLE);
-                        phonenumber_login.setVisibility(View.INVISIBLE);
-                        change_text.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-//                                mAuthHelper.quitLoginPage();
-                                Intent intent = new Intent(mActivity, PhoneNumLoginActivity.class);
-                                mActivity.startActivity(intent);
-                            }
-                        });
-                    }
-                })
-                .build());
-
-        int authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-        if (Build.VERSION.SDK_INT == 26) {
-            authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
-        }
-        AuthUIConfig authUIConfig = new AuthUIConfig.Builder()
-                .setAppPrivacyOne("《隐私权限和用户协议》", "http://m-xyyf-web.ai160.com/res/protocol/protocol.htm")
-//                .setAppPrivacyTwo("《百度》", "https://www.baidu.com")
-                .setPrivacyState(false)
-                .setAppPrivacyColor(Color.parseColor("#0B0B0B"), Color.parseColor("#2CBCFF"))
-                //隐藏默认切换其他登录方式
-                .setSwitchAccHidden(true)
-                //隐藏默认Toast
-                .setLogBtnToastHidden(false)
-                //沉浸式状态栏
-                .setStatusBarHidden(false)
-                .setStatusBarColor(Color.WHITE)
-                .setStatusBarUIFlag(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
-                .setLightColor(true)
-                .setWebNavTextSize(20)
-                //图片或者xml的传参方式为不包含后缀名的全称 需要文件需要放在drawable或drawable-xxx目录下 in_activity.xml, mytel_app_launcher.png
-//                .setAuthPageActIn("in_activity", "out_activity")
-//                .setAuthPageActOut("in_activity", "out_activity")
-                .setVendorPrivacyPrefix("《")
-                .setVendorPrivacySuffix("》")
-                .setPageBackgroundPath("page_background_color")
-                .setLogoImgPath("icon")
-                //一键登录按钮三种状态背景示例login_btn_bg.xml
-                .setLogBtnBackgroundPath("login_btn_bg")
-                .setLogBtnTextSize(AppUtils.dp2px(mContext, 6))
-                .setLogBtnOffsetY(AppUtils.dp2px(mContext, 100))
-                .setScreenOrientation(authPageOrientation)
-                .setNavText("")
-                .setNavReturnHidden(true)
-                .setNavColor(Color.WHITE)
-                .setSloganHidden(true)
-                .setSwitchAccText("其他手机号登录")
-                .setSwitchAccTextColor(Color.parseColor("#0B0B0B"))
-                .setProtocolLayoutGravity(Gravity.TOP)
-                .setUncheckedImgPath("logincheck")
-                .setCheckedImgPath("logincheck_selected")
-                .setPrivacyTextSize(12)
-                .setProtocolGravity(Gravity.TOP)
-                .create();
-        mAuthHelper.setAuthUIConfig(authUIConfig);
-    }
-
-}

+ 0 - 37
app/src/main/java/com/edufound/android/xyyf/phonelogin/PhoneLoginModel.java

@@ -1,37 +0,0 @@
-package com.edufound.android.xyyf.phonelogin;
-
-import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.base.BaseModel;
-import com.edufound.android.xyyf.util.ContextUtil;
-
-//做请求操作之类的
-public class PhoneLoginModel implements BaseModel {
-
-    //正式环境
-    private final String MEMBER_URL = "http://m-xyyf-api.ai160.com/member/";
-    //测试环境
-    //private final String MEMBER_URL = "http://m-xyyf-api.efunbox.cn/member/";
-
-    public PhoneLoginModel() {
-
-    }
-
-    @Override
-    public void LoadData(LoadDataBack callback) {
-        if (true) {
-            callback.success("12333333");
-        } else {
-            callback.failure();
-        }
-    }
-
-
-    public String getVerificationCodeUrl() {
-        return MEMBER_URL + "verificationCode/";
-    }
-
-    public String getVCodeLoginUrl() {
-        return MEMBER_URL + "registerMobile";
-    }
-
-}

+ 0 - 202
app/src/main/java/com/edufound/android/xyyf/phonelogin/PhoneLoginPersenter.java

@@ -1,202 +0,0 @@
-package com.edufound.android.xyyf.phonelogin;
-
-import android.animation.ValueAnimator;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.Base64;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.edufound.android.xyyf.activity.MainActivity;
-import com.edufound.android.xyyf.application.EApplication;
-import com.edufound.android.xyyf.base.BasePersenter;
-import com.edufound.android.xyyf.util.ContextUtil;
-import com.edufound.android.xyyf.util.DeviceUuidFactory;
-import com.edufound.android.xyyf.util.Logger;
-import com.edufound.android.xyyf.util.OKHttpUtil;
-import com.edufound.android.xyyf.util.SPutil;
-import com.edufound.android.xyyf.util.ToastUtil;
-import com.google.gson.JsonObject;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class PhoneLoginPersenter implements PhoneLoginIPersenter {
-
-    PhoneLoginModel mModel;
-    PhoneLoginView mView;
-    String phoneNum = "";
-
-    public PhoneLoginPersenter(PhoneLoginView view) {
-        mModel = new PhoneLoginModel();
-        mView = view;
-    }
-
-
-    @Override
-    public void loadData() {
-
-    }
-
-    @Override
-    public void onDisConnNetWork() {
-
-    }
-
-    @Override
-    public void onConnNetWork() {
-
-    }
-
-    public void WidthAnim(final View view, int end, int time) {
-        ValueAnimator anim = ValueAnimator.ofInt(view.getMeasuredWidth(), end);
-        anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                int val = (Integer) valueAnimator.getAnimatedValue();
-                ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-                layoutParams.width = val;
-                view.setLayoutParams(layoutParams);
-            }
-        });
-        anim.setDuration(time);
-        anim.start();
-    }
-
-
-    public boolean isMobileNO(String mobileNums) {
-/**
-    * 判断字符串是否符合手机号码格式
-    * 移动号段: 134,135,136,137,138,139,147,150,151,152,157,158,159,170,178,182,183,184,187,188
-    * 联通号段: 130,131,132,145,155,156,170,171,175,176,185,186
-    * 电信号段: 133,149,153,170,173,177,180,181,189
-    * @param str
-    * @return 待检测的字符串
-    */
-        String telRegex = "^((13[0-9])|(14[5,7,9])|(15[^4])|(18[0-9])|(17[0,1,3,5,6,7,8]))\\d{8}$";// "[1]"代表第1位为数字1,"[358]"代表第二位可以为3、5、8中的一个,"\\d{9}"代表后面是可以是0~9的数字,有9位。
-        if (TextUtils.isEmpty(mobileNums)) {
-            return false;
-        } else {
-            return mobileNums.matches(telRegex);
-        }
-    }
-
-    public void getVCode(String phoneNum) throws IOException {
-        this.phoneNum = phoneNum;
-        if (!isMobileNO(phoneNum)) {
-            ToastUtil.showToast("请输入正确的手机号");
-            mView.changeVText(1);
-            return;
-        }
-        mView.changeVText(0);
-        OKHttpUtil.getInstance().doGetSync(mModel.getVerificationCodeUrl() + phoneNum, new Callback() {
-            @Override
-            public void onFailure(Call call, IOException e) {
-                Logger.e("onFailure:" + e.getMessage());
-            }
-
-            @Override
-            public void onResponse(Call call, Response response) throws IOException {
-                try {
-                    String json = response.body().string();
-                    JSONObject jsonObject = new JSONObject(json);
-                    Logger.e("json:" + json);
-                    if (jsonObject.getBoolean("success")) {
-
-                    } else {
-                        final String error = jsonObject.getString("message");
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                ToastUtil.showToast(error);
-                            }
-                        });
-                        mView.changeVText(1);
-                    }
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
-            }
-        });
-
-    }
-
-
-    public void LoginByVCode(String phone, String vcode) throws JSONException {
-        String preuuid = SPutil.getPrefString(ContextUtil.getContext(), DeviceUuidFactory.UUID_SPKEY, "");
-        if (preuuid.equals("")) {
-            preuuid = DeviceUuidFactory.getUuid().toString();
-        }
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("deviceCode", preuuid);
-        jsonObject.put("channel", EApplication.getAppCode());
-        jsonObject.put("code", vcode);
-        if (this.phoneNum.equals("")) {
-            this.phoneNum = phone;
-        }
-        if (TextUtils.isEmpty(this.phoneNum.trim())) {
-            ToastUtil.showToast("请输入手机号");
-            return;
-        }
-        if (TextUtils.isEmpty(vcode.trim())) {
-            ToastUtil.showToast("请输入验证码");
-            return;
-        }
-        jsonObject.put("mobileNo", this.phoneNum);
-        OKHttpUtil.getInstance().postPhoneLogin(mModel.getVCodeLoginUrl(), jsonObject.toString(), new OKHttpUtil.ResultCallback() {
-            @Override
-            public void onError(Request request, Exception e) {
-                Logger.e("登录:onError");
-            }
-
-            @Override
-            public void onResponse(Object response) {
-                String json = response.toString();
-                try {
-                    JSONObject jsonObject1 = new JSONObject(json);
-                    if (jsonObject1.getBoolean("success")) {
-                        JSONObject user = jsonObject1.getJSONObject("data");
-                        SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(user.getString("mobile").getBytes(), Base64.DEFAULT));
-                        MainActivity.getInstance().loadJSMehtodPost("phoneSuccess(" + json + ")");
-                        MainActivity.getInstance().quitPhoneLoginPage();
-                        mView.getActivity().finish();
-                    } else {
-                        final String error = jsonObject1.getString("message");
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                ToastUtil.showToast(error);
-                            }
-                        });
-                    }
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
-            }
-        });
-    }
-
-    Handler handler = new Handler(new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message msg) {
-            return false;
-        }
-    });
-
-}
-
-
-interface PhoneLoginIPersenter extends BasePersenter {
-}

+ 0 - 17
app/src/main/java/com/edufound/android/xyyf/phonelogin/PhoneLoginView.java

@@ -1,17 +0,0 @@
-package com.edufound.android.xyyf.phonelogin;
-
-import android.app.Activity;
-import android.webkit.WebView;
-import android.widget.FrameLayout;
-
-import com.edufound.android.xyyf.base.BaseView;
-import com.google.gson.Gson;
-
-
-public interface PhoneLoginView extends BaseView {
-    //把View拋出給Presenter調用
-
-
-    void changeVText(int type);
-
-}