登录页

2020-04-11 11:24:14 +08:00
parent 9de0be4db2
commit be8394ba6e
8 changed files with 36 additions and 49 deletions
--- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
@@ -163,7 +163,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
    }

    public void initTitleBar() {
-        mTitleBar = (TitleBar) findViewById(R.id.title_bar);
+        mTitleBar = findViewById(R.id.title_bar);
        if (mTitleBar != null) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && needSteepStateBar()) {
                mTitleBar.setImmersive(true);
--- a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
@@ -31,7 +31,7 @@ public class AddUserInfoActivity extends BaseActivity {
    }

    public void showAddUserInfo() {
-//        initTitleBar("", false);
+        initTitleBar("", false);
 //        if (mTitleBar != null)
 //            mTitleBar.setLeftClickListener(new View.OnClickListener() {
 //                @Override
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java
@@ -1,59 +1,26 @@
 package com.yizhuan.erban.ui.login;

-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
 import android.text.Editable;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.text.style.ForegroundColorSpan;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;

-import com.ishumei.smantifraud.SmAntiFraud;
-import com.netease.mobsec.rjsb.watchman;
-import com.orhanobut.logger.Logger;
-import com.trello.rxlifecycle2.android.ActivityEvent;
 import com.yizhuan.erban.R;
-import com.yizhuan.erban.UIHelper;
 import com.yizhuan.erban.base.BaseActivity;
-import com.yizhuan.erban.base.BaseLoginAct;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.erban.utils.KeyBoardUtils;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
-import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
-import com.yizhuan.xchat_android_core.auth.exception.ShowPhoneCodeException;
-import com.yizhuan.xchat_android_core.code.CodeModel;
-import com.yizhuan.xchat_android_core.code.CodeType;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
-import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory;
 import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;

 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import io.reactivex.SingleObserver;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
 /**
 * @author zhouxiangfeng
 * @date 17/2/26
@@ -88,6 +55,7 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_login_phone);
+        EventBus.getDefault().register(this);
        initTitleBar("",true);
        onFindViews();
        onSetListener();
@@ -148,6 +116,7 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
    protected void onDestroy() {
        accountEt = null;
        super.onDestroy();
+        EventBus.getDefault().unregister(this);
    }


@@ -164,6 +133,15 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
            hideIME();
        }
        return super.onTouchEvent(event);
+    }

+    /**
+     * 注册成功后发送过来的事件
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLoginEvent(LoginEvent event) {
+        getDialogManager().dismissDialog();
+        setResult(RESULT_OK);
+        finish();
    }
 }
--- a/app/src/main/res/layout/maint_tab_red_poin_layout.xml
+++ b/app/src/main/res/layout/maint_tab_red_poin_layout.xml
@@ -23,8 +23,8 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignTop="@+id/main_tab_msg"
-        android:layout_marginStart="-20dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginStart="-12dp"
+        android:layout_marginTop="1dp"
        android:layout_toEndOf="@+id/main_tab_msg"
        android:background="@drawable/bg_msg_number"
        android:gravity="center"
--- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
+++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
@@ -30,7 +30,7 @@ public class QuickLoginUiConfig {
        int maskNumSize = 20;
        int sloganToTop = maskNumToTop + maskNumSize + 16;
        int sloganSize = 14;
-        int loginBtnToTop = sloganToTop + sloganSize + 46;
+        int loginBtnToTop = sloganToTop + sloganSize + 86;
        int loginBtnHeight = 48;

        int X_OFFSET = 0;
--- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
+++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
@@ -26,12 +26,17 @@ import com.yizhuan.erban.base.BaseLoginAct;
 import com.yizhuan.erban.ui.login.LoginPhoneActivity;
 import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
+import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
 import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
 import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
 import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;

+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -79,7 +84,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.act_quick_pass);
-
+        EventBus.getDefault().register(this);
        login = QuickLogin.getInstance(getApplicationContext(), XChatConstants.QUICK_PASS_BUSINESS_ID);// BUSINESS_ID为从易盾官网申请的业务id
        login.setUnifyUiConfig(QuickLoginUiConfig.getUiConfig(getApplicationContext()));

@@ -94,13 +99,12 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
    private void onFindViews() {
        tvLoginQuickPass = findViewById(R.id.tv_login_quick_pass);
        tvProtocol = findViewById(R.id.tv_protocol);
-        setProtocol();
        wxLogin = findViewById(R.id.img_wx_login);
        qqLogin = findViewById(R.id.img_qq_login);
        tvLoginTip = findViewById(R.id.tv_login_tip);
        tvDesc = findViewById(R.id.tv_desc);
-
        phoneLogin = findViewById(R.id.img_phone_login);
+        setProtocol();
    }

    private void onSetListener() {
@@ -299,17 +303,22 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 //            phoneLogin.setEnabled(enable);
 //        }
        canClick = enable;
+    }

+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
    }

    /**
     * 注册成功后发送过来的事件
     */
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void onLoginEvent(LoginEvent event) {
-//        getDialogManager().dismissDialog();
-//        setResult(RESULT_OK);
-//        finish();
-//    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLoginEvent(LoginEvent event) {
+        getDialogManager().dismissDialog();
+        setResult(RESULT_OK);
+        finish();
+    }

 }
--- a/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml
+++ b/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <corners android:radius="20dp"/>
+    <corners android:radius="25dp"/>

    <solid android:color="@color/white"/>

--- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml
+++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
@@ -22,7 +22,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="9.5dp"
-        android:text="@string/quick_pass_slogan"
+        android:text=""
        android:textSize="@dimen/dp_16"
        android:textColor="@color/color_B3B3B3"
        app:layout_constraintStart_toStartOf="parent"