diff --git a/app/build.gradle b/app/build.gradle
index ea8f8c27e7..7f3bf26ae8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,8 +77,6 @@ android {
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
-        buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-        buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -157,6 +155,8 @@ android {
             buildConfigField "String", "DEV_API_HOST", "\"${DEV_API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_DEV_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
         }
 
         // publish release host
@@ -166,6 +166,8 @@ android {
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
         }
 
         tea {
@@ -174,6 +176,8 @@ android {
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -363,9 +367,6 @@ andResGuard {
             "R.drawable.ic_recommend_function",
             "R.drawable.ic_recommend_gift",
             "R.drawable.ic_recommend_role",
-            "R.drawable.download_button_normal_style",
-            "R.drawable.ic_quick_login_check",
-            "R.drawable.ic_quick_login_uncheck",
             "R.anim.anim_auth_in",
             "R.anim.anim_auth_out",
             "R.id.download_speed",
diff --git a/app/libs/quick_login_android_5.8.1.aar b/app/libs/quick_login_android_5.8.1.aar
deleted file mode 100644
index 7f877f15dd..0000000000
Binary files a/app/libs/quick_login_android_5.8.1.aar and /dev/null differ
diff --git a/app/libs/quick_login_android_5.9.4.aar b/app/libs/quick_login_android_5.9.4.aar
new file mode 100755
index 0000000000..78a320eeba
Binary files /dev/null and b/app/libs/quick_login_android_5.9.4.aar differ
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index a7b7b8e36e..c832bd5b02 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -333,7 +333,7 @@ public class MainActivity extends BaseActivity {
         // 检查是否需要触发 XAPK 安装
         AppExecutor.getUiExecutor().executeWithDelay(this::resumeXapkInstallIfNeeded, 150);
 
-//        QuickLoginHelper.getPhoneInfo(this);
+        QuickLoginHelper.getPhoneInfo();
         WechatBindHelper.getWechatConfig(null);
         initWBSDK();
         CertificationSwitchHelper.getCertificationSwitch();
diff --git a/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneViewModel.kt b/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneViewModel.kt
index c3dbf9fc13..1eb489230b 100644
--- a/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneViewModel.kt
+++ b/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneViewModel.kt
@@ -93,7 +93,6 @@ class VerifyPhoneViewModel(application: Application) : AndroidViewModel(applicat
                             cachedUserInfo.mobileAuth = entity.apply {
                                 remark = cachedUserInfo.mobileAuth?.remark ?: LinkEntity()
                             }
-                            Log.i("LYRR", "cachedUserInfo.mobileAuth = " + cachedUserInfo.mobileAuth)
                             UserRepository.getInstance().cacheAndNotifyUserInfo(cachedUserInfo, true)
                         }
                         finishLiveData.postValue(true)
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index aae24ee00d..11f4febdc5 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -330,12 +330,6 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <style name="quickLoginDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowBackground">@drawable/bg_invite_dialog</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowCloseOnTouchOutside">true</item>
-    </style>
-
     <style name="UserHomeFilterItem">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">28dp</item>
diff --git a/gradle.properties b/gradle.properties
index 67970e6605..2eb5a6f788 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,6 +49,8 @@ DOUYIN_CLIENTKEY=aw66h51ftb71dkhi
 DOUYIN_CLIENTSECRET=155dee6c1de9ae31bffcbf32475dc161
 QUICK_LOGIN_APPID=300012035775
 QUICK_LOGIN_APPKEY=002BAABA2C078342DA33BEAB0A4C6A25
+DEV_QUICK_LOGIN_APPID=300012281661
+DEV_QUICK_LOGIN_APPKEY=1BFAB6E349F1D69CC06ABAD9D7A43FB8
 
 # hosts
 DEV_API_HOST=https\://dev-and-api.ghzs.com/v5d5d0/
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
index bf5b7dc823..cdee6cdffb 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
@@ -223,7 +223,7 @@ public class EntranceConsts {
     public static final String KEY_SUB_CATEGORY_ID = "sub_category_id";
     public static final String KEY_IS_QA_FEEDBACK = "is_qa_feedback";
     public static final String KEY_IS_CLICK_RECEIVE_BTN = "is_click_receive_btn";
-    public static final String KEY_SHOW_QUICK_LOGIN = "show_quick_login";
+    public static final String KEY_FROM_QUICK_LOGIN = "show_quick_login";
     public static final String KEY_VIDEO_LIST = "video_list";
     public static final String KEY_CHOOSE_FORUM_TYPE = "choose_forum_type";
     public static final String KEY_CHOOSE_MAX_COUNT = "choose_max_count";
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/NetworkUtils.java b/module_common/src/main/java/com/gh/gamecenter/common/utils/NetworkUtils.java
index 63d7970074..6ee7a62609 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/utils/NetworkUtils.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/NetworkUtils.java
@@ -85,8 +85,8 @@ public class NetworkUtils {
      * 判断是否打开数据流量(一键登录必须要打开流量才能获取到手机号码)
      *
      * AuthnHelper的getNetworkType方法用于获取用户当前的网络环境和运营商，返回的是JSONObject，其中
-     * operatorType字段获取网络运营商: 0.未知 1.移动流量 2.联通流量 3.电信流量，
-     * networkType字段获取网络状态：0.未知；1.流量 2.wifi；3.数据流量+wifi
+     * operatortype字段获取网络运营商: 0.未知 1.移动流量 2.联通流量 3.电信流量，
+     * networktype字段获取网络状态：0.未知；1.流量 2.wifi；3.数据流量+wifi
      */
     public static boolean isOpenMobileData(Context context){
         IQuickLoginProvider quickLoginHelper = (IQuickLoginProvider) ARouter.getInstance().build(RouteConsts.provider.quickLogin).navigation();
diff --git a/app/src/main/res/drawable-night/ic_selector_default.xml b/module_common/src/main/res/drawable-night/ic_selector_default.xml
similarity index 100%
rename from app/src/main/res/drawable-night/ic_selector_default.xml
rename to module_common/src/main/res/drawable-night/ic_selector_default.xml
diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_999.xml b/module_common/src/main/res/drawable/bg_shape_f5_radius_999.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_shape_f5_radius_999.xml
rename to module_common/src/main/res/drawable/bg_shape_f5_radius_999.xml
diff --git a/app/src/main/res/drawable/button_blue_oval.xml b/module_common/src/main/res/drawable/button_blue_oval.xml
similarity index 100%
rename from app/src/main/res/drawable/button_blue_oval.xml
rename to module_common/src/main/res/drawable/button_blue_oval.xml
diff --git a/app/src/main/res/drawable/ic_selector_default.xml b/module_common/src/main/res/drawable/ic_selector_default.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_selector_default.xml
rename to module_common/src/main/res/drawable/ic_selector_default.xml
diff --git a/app/src/main/res/drawable/ic_selector_selected.xml b/module_common/src/main/res/drawable/ic_selector_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_selector_selected.xml
rename to module_common/src/main/res/drawable/ic_selector_selected.xml
diff --git a/module_login/src/main/res/drawable/bg_invite_dialog.xml b/module_energy/src/main/res/drawable/bg_invite_dialog.xml
similarity index 100%
rename from module_login/src/main/res/drawable/bg_invite_dialog.xml
rename to module_energy/src/main/res/drawable/bg_invite_dialog.xml
diff --git a/module_login/libs/quick_login_android_5.8.1.aar b/module_login/libs/quick_login_android_5.8.1.aar
deleted file mode 100644
index 7f877f15dd..0000000000
Binary files a/module_login/libs/quick_login_android_5.8.1.aar and /dev/null differ
diff --git a/module_login/libs/quick_login_android_5.9.4.aar b/module_login/libs/quick_login_android_5.9.4.aar
new file mode 100755
index 0000000000..78a320eeba
Binary files /dev/null and b/module_login/libs/quick_login_android_5.9.4.aar differ
diff --git a/module_login/src/main/AndroidManifest.xml b/module_login/src/main/AndroidManifest.xml
index 1e885c7244..13fc95ede7 100644
--- a/module_login/src/main/AndroidManifest.xml
+++ b/module_login/src/main/AndroidManifest.xml
@@ -22,11 +22,16 @@
             android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
+            android:name="com.gh.gamecenter.login.view.QuickLoginHelperActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent"/>
+
+        <activity
+            android:name="com.cmic.gen.sdk.view.GenLoginAuthActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Dialog" />
+             />
 
         <activity
             android:name="${applicationId}.wxapi.WXEntryActivity"
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt b/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt
index f1ead8f14b..e4c27a8836 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt
+++ b/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt
@@ -2,7 +2,7 @@ package com.gh.gamecenter.login.provider
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.cmic.sso.sdk.auth.AuthnHelper
+import com.cmic.gen.sdk.auth.GenAuthnHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IQuickLoginProvider
 import com.gh.gamecenter.login.utils.QuickLoginHelper
@@ -16,11 +16,11 @@ class QuickLoginProviderImpl : IQuickLoginProvider {
     }
 
     override fun isOpenMobileData(context: Context): Boolean {
-        val helper = AuthnHelper.getInstance(context)
+        val helper = GenAuthnHelper.getInstance(context)
         val jsonObject = helper.getNetworkType(context)
         val net: Int
         try {
-            net = jsonObject.getString("networkType").toInt()
+            net = jsonObject.getString("networktype").toInt()
             if (net == 1 || net == 3) return true
         } catch (e: JSONException) {
             e.printStackTrace()
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java b/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java
index 7fd0a84eb5..75f20a78b7 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java
+++ b/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java
@@ -45,7 +45,7 @@ import com.gh.gamecenter.login.entity.LoginTokenEntity;
 import com.gh.gamecenter.login.entity.TokenEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.login.utils.LoginUtils;
-import com.lightgame.config.CommonDebug;
+import com.gh.gamecenter.login.utils.QuickLoginHelper;
 import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -153,6 +153,9 @@ public class UserRepository {
 
         IDataUtilsProvider dataUtils = (IDataUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.dataUtils).navigation();
         dataUtils.getDeviceCertification();
+
+        // 退出登录后进行预取号
+        QuickLoginHelper.getPhoneInfo();
     }
 
     public LiveData<ApiResponse<UserInfoEntity>> getLoginUserInfo() {
@@ -529,8 +532,6 @@ public class UserRepository {
 
                 if (loginTag != null) {
                     Utils.toast(mContext, R.string.login_success);
-                    EventBus.getDefault().post(new EBReuse(LOGIN_TAG));
-
 
                     IMessageUnreadRepositoryProvider messageUnreadRepository = (IMessageUnreadRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.messageUnreadRepository).navigation();
                     messageUnreadRepository.loadMessageUnreadData();
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogUtils.java b/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogUtils.java
new file mode 100644
index 0000000000..785286fbbe
--- /dev/null
+++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogUtils.java
@@ -0,0 +1,66 @@
+package com.gh.gamecenter.login.utils;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.Window;
+
+import androidx.core.content.ContextCompat;
+
+import com.gh.gamecenter.common.callback.ConfirmListener;
+import com.gh.gamecenter.login.R;
+import com.gh.gamecenter.login.databinding.DialogLoginPolicyBinding;
+import com.lightgame.utils.AppManager;
+
+public class DialogUtils {
+    /**
+     * @param context may be is application context
+     * @return activity context
+     */
+    public static Context checkDialogContext(Context context) {
+        if (context == null) {
+            throw new NullPointerException("dialog context is null");
+        }
+
+        if (context instanceof Activity) {
+            return context;
+        }
+
+        // currentActivity 是否存在 isDestroyed 的情况?
+        return AppManager.getInstance().currentActivity();
+    }
+
+    public static void showLoginPolicyDialog(Context context, Context nightContext, boolean isFromQuickLogin, CharSequence privacyText, ConfirmListener listener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogLoginPolicyBinding binding = DialogLoginPolicyBinding.inflate(LayoutInflater.from(context));
+
+        binding.container.setBackground(ContextCompat.getDrawable(nightContext, R.drawable.background_shape_white_radius_6));
+        binding.title.setTextColor(ContextCompat.getColor(nightContext, R.color.text_title));
+        binding.content.setTextColor(ContextCompat.getColor(nightContext, R.color.text_subtitle));
+        binding.negativeTv.setTextColor(ContextCompat.getColor(nightContext, R.color.text_title));
+        binding.negativeTv.setBackground(ContextCompat.getDrawable(nightContext, R.drawable.bg_shape_f5_radius_999));
+        binding.positiveTv.setTextColor(ContextCompat.getColor(nightContext, R.color.text_white));
+        binding.positiveTv.setBackground(ContextCompat.getDrawable(nightContext, R.drawable.button_blue_oval));
+
+        String contentStr;
+        if (isFromQuickLogin) {
+            contentStr = context.getString(R.string.dialog_quick_login_policy_content, privacyText);
+        } else {
+            contentStr = context.getString(R.string.dialog_login_policy_content);
+        }
+        binding.content.setText(Html.fromHtml(contentStr));
+        binding.negativeTv.setOnClickListener(v -> dialog.dismiss());
+        binding.positiveTv.setOnClickListener(v -> {
+            dialog.dismiss();
+            listener.onConfirm();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+    }
+}
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
index 020272ec4b..98f4b7d50a 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
+++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
@@ -2,13 +2,10 @@ package com.gh.gamecenter.login.utils
 
 import android.app.Activity
 import android.content.Intent
-import com.gh.gamecenter.common.constant.Constants
 import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.common.utils.tryWithDefaultCatch
 import com.gh.gamecenter.core.provider.IConfigProvider
-import com.gh.gamecenter.core.utils.SentryHelper
 import com.lightgame.utils.RuntimeUtils
 import com.gh.gamecenter.login.HaloApp
 import com.gh.gamecenter.login.R
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt
index 3cc81d2847..6727b7f019 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt
+++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt
@@ -1,43 +1,43 @@
 package com.gh.gamecenter.login.utils
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Context
-import android.content.pm.PackageManager
+import android.content.Intent
 import android.graphics.Color
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.Window
-import android.view.WindowManager
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.core.text.getSpans
+import androidx.core.view.doOnAttach
 import com.alibaba.android.arouter.launcher.ARouter
-import com.cmic.sso.sdk.AuthThemeConfig
-import com.cmic.sso.sdk.auth.AuthnHelper
-import com.cmic.sso.sdk.auth.LoginClickListener
-import com.cmic.sso.sdk.auth.TokenListener
-import com.gh.gamecenter.common.callback.BiCallback
+import com.cmic.gen.sdk.auth.GenAuthnHelper
+import com.cmic.gen.sdk.auth.GenTokenListener
+import com.cmic.gen.sdk.view.GenAuthThemeConfig
+import com.cmic.gen.sdk.view.GenLoginClickListener
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.databinding.SetWaitDialogBinding
-import com.gh.gamecenter.common.retrofit.ApiResponse
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.utils.DialogUtils.checkDialogContext
-import com.gh.gamecenter.common.utils.PermissionHelper.checkReadPhoneStatePermissionBeforeAction
 import com.gh.gamecenter.core.provider.IConfigProvider
-import com.gh.gamecenter.core.provider.ILogUtilsProvider
 import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.ClickUtils
-import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.ToastUtils.toast
+import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.login.HaloApp
 import com.gh.gamecenter.login.R
-import com.gh.gamecenter.login.databinding.DialogQuickLoginBinding
-import com.gh.gamecenter.login.databinding.DialogQuickLoginPermissionBinding
-import com.gh.gamecenter.login.entity.LoginTokenEntity
+import com.gh.gamecenter.login.databinding.LayoutQuickLoginBinding
 import com.gh.gamecenter.login.user.LoginTag
-import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.view.LoginActivity
+import com.gh.gamecenter.login.view.QuickLoginHelperActivity
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 import org.json.JSONObject
@@ -51,35 +51,35 @@ import org.json.JSONObject
  *
  * 一键登录SDK对接文档：http://dev.10086.cn/docInside?contentId=10000067541479
  */
+@SuppressLint("StaticFieldLeak")
 object QuickLoginHelper {
 
-    private var mAuthnHelper: AuthnHelper? = null
-    private var mTokenListener: TokenListener? = null
+    private var mAuthnHelper: GenAuthnHelper? = null
+    private var mTokenListener: GenTokenListener? = null
     private var mPreDialog: Dialog? = null
-    private var mDialog: Dialog? = null
+    private var mLoggingDialog: Dialog? = null
     private var mToken: String = ""
+    private var mEntrance: String = ""
     private var mOpenAuthPageSuccess = false
+    private var mPrivacyCheckBox: CheckBox? = null
+    private var mPrivacyText: CharSequence = ""
+    private var mLoginBtn: View? = null
     private const val REQUEST_GET_PHONE_INFO_CODE = 100
     private const val REQUEST_LOGIN_AUTH_CODE = 101
     private const val ENTRANCE_DEFAULT = "一键登录"
-    private const val ENTRANCE_PERMISSION_DIALOG = "一键登录权限弹窗"
-    private const val AUTH_ACTIVITY_NAME = "com.cmic.sso.sdk.activity.LoginAuthActivity"
-    const val STATUS_DEFAULT = 0 // 默认(隐藏一键登录按钮)
-    const val STATUS_FROM_QUICK_LOGIN_PAGE = 1 // 从一键登录的授权页过来
-    const val STATUS_FROM_QUICK_LOGIN_PERMISSION = 2 // 从一键登录的电话权限弹窗过来
-
+    private const val AUTH_ACTIVITY_NAME = "com.cmic.gen.sdk.view.GenLoginAuthActivity"
 
     // 1.取号请求(可提前进行)
     @JvmStatic
-    fun getPhoneInfo(context: Context) {
+    fun getPhoneInfo() {
         if (isPublishEnv()) {
-            AuthnHelper.setDebugMode(false)
+            GenAuthnHelper.setDebugMode(false)
         } else {
-            AuthnHelper.setDebugMode(true)
+            GenAuthnHelper.setDebugMode(true)
         }
 
         val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as? IConfigProvider
-        AuthnHelper.getInstance(context.applicationContext).getPhoneInfo(
+        GenAuthnHelper.getInstance(HaloApp.getInstance().applicationContext).getPhoneInfo(
             config?.getQuickLoginAppId(),
             config?.getQuickLoginAppKey(),
             { requestCode: Int, jsonObject: JSONObject ->
@@ -100,78 +100,33 @@ object QuickLoginHelper {
         // 防止短时间多次调用
         if (ClickUtils.isFastDoubleClick(991)) return
 
+        mEntrance = entrance
         mOpenAuthPageSuccess = false
 
         if (isPublishEnv()) {
-            AuthnHelper.setDebugMode(false)
+            GenAuthnHelper.setDebugMode(false)
         } else {
-            AuthnHelper.setDebugMode(true)
+            GenAuthnHelper.setDebugMode(true)
         }
 
         if (mAuthnHelper == null) {
-            initSDK(context, entrance)
+            initSDK(context)
         }
 
         if (mTokenListener == null) {
-            initTokenListener(context)
+            initTokenListener()
         }
 
         loginAuth(context)
-
-//        if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-//            loginAuth(context)
-//        } else {
-//            showQuickLoginPermissionDialog(
-//                context,
-//                {
-//                    checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback {
-//                        override fun onCallback() {
-//                            loginAuth(context)
-//                        }
-//                    })
-//                },
-//                {
-//                    startCodeLoginPage(
-//                        context,
-//                        entrance = ENTRANCE_PERMISSION_DIALOG,
-//                        isFinishAuth = false,
-//                        isFromPermission = true
-//                    )
-//                }
-//            )
-//        }
     }
 
-    @JvmStatic
-    fun showQuickLoginPermissionDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
-        val solidContext = checkDialogContext(context)
-
-        val dialog = Dialog(solidContext, R.style.DialogWindowTransparent)
-        val binding: DialogQuickLoginPermissionBinding =
-            DialogQuickLoginPermissionBinding.inflate(LayoutInflater.from(solidContext))
-
-        binding.confirmBtn.setOnClickListener {
-            dialog.dismiss()
-            confirm.invoke()
-        }
-
-        binding.cancelBtn.setOnClickListener {
-            dialog.dismiss()
-            cancel.invoke()
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.setContentView(binding.root)
-        dialog.show()
-    }
-
-    private fun initSDK(context: Context, entrance: String) {
-        mAuthnHelper = AuthnHelper.getInstance(context.applicationContext)
+    private fun initSDK(context: Context) {
+        mAuthnHelper = GenAuthnHelper.getInstance(HaloApp.getInstance().applicationContext)
         mAuthnHelper?.run {
             // 设置超时时间
             overTime = 3000
 
-            authThemeConfig = getConfig(context, entrance)
+            authThemeConfig = getConfig(context)
             // 授权页面的回调方法
             setPageInListener { code, _ ->
                 // 返回码200087代表授权页成功拉起
@@ -182,15 +137,15 @@ object QuickLoginHelper {
                     mOpenAuthPageSuccess = true
                 } else { // 不成功就调起验证码登录页
                     toastCode(code)
-                    startCodeLoginPage(context, true)
+                    startCodeLoginPage(true)
                 }
             }
         }
     }
 
-    private fun initTokenListener(context: Context) {
+    private fun initTokenListener() {
         // token回调
-        mTokenListener = TokenListener { requestCode: Int, jsonObject: JSONObject ->
+        mTokenListener = GenTokenListener { requestCode: Int, jsonObject: JSONObject ->
             val code = jsonObject.optString("resultCode")
             // “103000”为成功
             if (code == "103000") {
@@ -200,7 +155,7 @@ object QuickLoginHelper {
                 }
             } else if (code != "200020") { // 不成功就调起验证码登录页(200020代表授权页关闭)
                 toastCode(code)
-                startCodeLoginPage(context, true)
+                startCodeLoginPage(true)
             }
         }
     }
@@ -224,140 +179,226 @@ object QuickLoginHelper {
         mAuthnHelper?.loginAuth(config?.getQuickLoginAppId(), config?.getQuickLoginAppKey(), mTokenListener, REQUEST_LOGIN_AUTH_CODE)
     }
 
-    private fun getConfig(context: Context, entrance: String): AuthThemeConfig {
-        return AuthThemeConfig.Builder()
-            .setStatusBar(Color.WHITE, true) //状态栏颜色、是否高亮
+    private fun getConfig(context: Context): GenAuthThemeConfig {
+        val isDarkModeOn = DarkModeUtils.isDarkModeOn(context)
+        return GenAuthThemeConfig.Builder()
+            .setStatusBar(Color.TRANSPARENT, !isDarkModeOn) //状态栏颜色、是否高亮
             .setAuthContentView(getCustomView(context)) //自定义布局
             // 服务条款标题栏
             .setClauseLayoutResID(R.layout.layout_quick_login_navigation, "backIv") //服务条款标题栏
             .setNavTextColor(Color.BLACK) //服务条款标题颜色
             .setNavTextSize(18) //服务条款标题字体大小
             // 手机号码
-            .setNumberSize(20, true) //手机号码字体大小
-            .setNumberColor(R.color.text_title.toColor()) //手机号码字体颜色
-            .setNumFieldOffsetY(95) //号码栏Y偏移量
+            .setNumberSize(28, true) //手机号码字体大小
+            .setNumberColor(R.color.text_title.toColor(context)) //手机号码字体颜色
+            .setNumFieldOffsetY(440) //号码栏Y偏移量
             // 登录按钮
-            .setLogBtnImgPath("download_button_normal_style") //登录按钮背景
-            .setLogBtnText("本机号码一键登录", Color.WHITE, 16, false) //登录按钮相关
-            .setLogBtnOffsetY(170) //登录按钮Y偏移量
+//            .setLogBtnImgPath("download_button_normal_style") //登录按钮背景
+            .setLogBtnText("一键登录", Color.WHITE, 16, false) //登录按钮相关
+            .setLogBtnOffsetY(522) //登录按钮Y偏移量
             .setLogBtn(1000, 44) //登录按钮相关宽高
-            .setLogBtnMargin(20, 20) //登录按钮相对于屏幕左右边缘边距
+            .setLogBtnMargin(40, 40) //登录按钮相对于屏幕左右边缘边距
             // 回调
-            .setBackPressedListener {} //返回键回调
-            .setLogBtnClickListener(object : LoginClickListener {
-                override fun onLoginClickStart(context: Context, jsonObj: JSONObject?) {
-                    val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as? ILogUtilsProvider
-                    logUtils?.login("logging", "一键登录", entrance)
-                    mDialog = Dialog(context, R.style.DialogWindowTransparent).apply {
-                        val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply {
-                            setWaitMessage.text = R.string.logging.toResString()
+            .setGenBackPressedListener {
+                dismissDialog()
+                release()
+            } //返回键回调
+            .setLogBtnClickListener(object : GenLoginClickListener {
+                override fun onLoginClickStart(oauthContext: Context, jsonObj: JSONObject?) {
+                    runOnUiThread {
+                        val dialogContext = DialogUtils.checkDialogContext(oauthContext)
+                        if (dialogContext is Activity && dialogContext.isFinishing) return@runOnUiThread
+                        mLoggingDialog = Dialog(oauthContext, R.style.DialogWindowTransparent).apply {
+                            val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(oauthContext)).apply {
+                                root.background = R.drawable.background_shape_white_radius_8.toDrawable(context)
+                                setWaitMessage.setTextColor(R.color.text_title.toColor(context))
+                                setWaitMessage.text = R.string.logging.toResString()
+                            }
+                            requestWindowFeature(Window.FEATURE_NO_TITLE)
+                            setContentView(binding.root)
+                            setCanceledOnTouchOutside(false)
+                            show()
                         }
-                        requestWindowFeature(Window.FEATURE_NO_TITLE)
-                        setContentView(binding.root)
-                        setCanceledOnTouchOutside(false)
-                        show()
                     }
                 }
 
-                override fun onLoginClickComplete(context: Context, jsonObj: JSONObject?) {
+                override fun onLoginClickComplete(oauthContext: Context, jsonObj: JSONObject?) {
                     if (mToken.isNotBlank()) {
-                        val params = HashMap<String, String>()
-                        params["token"] = mToken
-
-                        // 4.请求登录接口
-                        UserRepository.getInstance().login(
-                            JSONObject(params as Map<*, *>),
-                            LoginTag.oauth,
-                            object : BiCallback<LoginTokenEntity, ApiResponse<LoginTokenEntity>> {
-                                override fun onFirst(first: LoginTokenEntity) {
-                                    if (mDialog != null && mDialog!!.isShowing) {
-                                        mDialog?.dismiss()
-                                    }
-
-                                    SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false)
-
-                                    val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as? ILogUtilsProvider
-                                    logUtils?.login("success", "一键登录", entrance)
-                                    finishAuthActivity()
-                                }
-
-                                override fun onSecond(second: ApiResponse<LoginTokenEntity>) {
-                                    if (mDialog != null && mDialog!!.isShowing) {
-                                        mDialog?.dismiss()
-                                    }
-                                }
-                            }
-                        )
-                    } else {
-                        if (mDialog != null && mDialog!!.isShowing) {
-                            mDialog?.dismiss()
-                        }
+                        startQuickLoginHelperPage(LoginTag.oauth)
                     }
                 }
             }) //登录按钮回调
-            .setCheckBoxListener { _: Context?, _: JSONObject? ->
-                toast("请先勾选同意《${getOperatorType(context)}认证服务协议》《用户协议》《隐私政策》")
+            .setGenCheckBoxListener { oauthContext: Context, _: JSONObject? ->
+                showLoginPolicyDialog(oauthContext, context) {
+                    mLoginBtn?.performClick()
+                }
             }  //勾选回调
             // 勾选框
             .setCheckTipText("") //设置未勾选时弹出提示
-            .setCheckBoxImgPath("ic_quick_login_check", "ic_quick_login_uncheck", 12, 12) //勾选图片
+            .setCheckBoxImgPath("", "", 16, 16) //勾选图片
             // 服务条款、用户协议、隐私政策
             .setPrivacyState(false) //默认不勾选
             .setPrivacyAlignment(
-                "阅读并同意 " + AuthThemeConfig.PLACEHOLDER + " 用户协议 隐私政策",
+                "阅读并同意 " + "用户协议、隐私政策、" + GenAuthThemeConfig.PLACEHOLDER ,
                 "用户协议", R.string.disclaimer_url.toResString(),
                 "隐私政策", R.string.privacy_policy_url.toResString(),
                 "", "", "", ""
             ) //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款)
-            .setPrivacyText(11, R.color.text_subtitleDesc.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置
-            .setPrivacyMargin(30, 32) //隐私条款距离手机左右边缘的边距
-            .setPrivacyOffsetY(280) //隐私条款Y偏移量
+            .setPrivacyText(12, R.color.text_subtitleDesc.toColor(context), R.color.text_subtitle.toColor(context), true, false) //条款文本设置
+            .setPrivacyMargin(40, 40) //隐私条款距离手机左右边缘的边距
+            .setPrivacyOffsetY(596) //隐私条款Y偏移量
+            .setCheckBoxLocation(0)
             // 语言
             .setAppLanguageType(0) //0.中文简体1.中文繁体2.英文
             // 转场动画
             .setAuthPageActIn("anim_auth_in", "anim_auth_out")
-//                .setAuthPageActOut("anim_auth_in","anim_auth_out")
+//            .setAuthPageActOut("anim_auth_in","anim_auth_out")
             // 整体布局
-            .setAuthPageWindowMode(WindowManager.LayoutParams.MATCH_PARENT, 360) //授权页窗口宽高比例
-            .setWindowBottom(1) //授权页是否居于底部，0=居中;1=底部，设置为1Y轴的偏移 失效
+            .setAuthPageWindowMode(0, 0) //授权页窗口宽高比例
+            .setWindowBottom(0) //授权页是否居于底部，0=居中;1=底部，设置为1Y轴的偏移 失效
             .setFitsSystemWindows(false)
-            .setThemeId(R.style.quickLoginDialog) //授权页弹窗主题
+//            .setThemeId(-1) //授权页弹窗主题
             .build()
     }
 
     // 获取自定义布局View
     @SuppressLint("SetTextI18n")
     private fun getCustomView(context: Context): View {
-        return DialogQuickLoginBinding.inflate(LayoutInflater.from(context)).apply {
-            closeIv.setOnClickListener {
+        return LayoutQuickLoginBinding.inflate(LayoutInflater.from(context)).apply {
+            descTv.text = "${getOperatorType()}提供认证服务"
+            closeBtn.setOnClickListener {
                 finishAuthActivity()
             }
             changeLoginBtn.setOnClickListener {
-                startCodeLoginPage(context, false)
+                showLoginPolicyDialog(context) {
+                    startCodeLoginPage(false)
+                }
+            }
+            qqBtn.setOnClickListener {
+                showLoginPolicyDialog(context) {
+                    startQuickLoginHelperPage(LoginTag.qq)
+                }
+            }
+            wechatBtn.setOnClickListener {
+                showLoginPolicyDialog(context) {
+                    startQuickLoginHelperPage(LoginTag.wechat)
+                }
+            }
+            weiboBtn.setOnClickListener {
+                showLoginPolicyDialog(context) {
+                    startQuickLoginHelperPage(LoginTag.weibo)
+                }
+            }
+            root.doOnAttach {
+                initView(context, root)
             }
-            descTv.text = "${getOperatorType(context)}提供认证服务"
         }.root
     }
 
+    private fun showLoginPolicyDialog(context: Context, callback: (() -> Unit)) {
+        showLoginPolicyDialog(AppManager.getInstance().recentActiveActivity, context, callback)
+    }
+
+    private fun showLoginPolicyDialog(oauthContext: Context, context: Context, callback: (() -> Unit)) {
+        DialogUtils.showLoginPolicyDialog(
+            oauthContext,
+            context,
+            true,
+            mPrivacyText
+        ) {
+            mPrivacyCheckBox?.isChecked = true
+            callback.invoke()
+        }
+    }
+
+    private fun initView(context: Context, root: View) {
+        (root.parent as ViewGroup).setBackgroundColor(R.color.background_white.toColor(context))
+        (((root.parent as ViewGroup).getChildAt(1) as ViewGroup).getChildAt(0) as TextView).run {
+            includeFontPadding = false
+            text = text.toString().replace("*", "･")
+        }
+        (root.parent as ViewGroup).getChildAt(2).background = R.drawable.download_button_normal_style.toDrawable(context)
+        ((((root.parent as ViewGroup).getChildAt(3) as ViewGroup).getChildAt(0) as ViewGroup).getChildAt(0) as CheckBox).run {
+            enlargeTouchArea(4F.dip2px())
+            setOnCheckedChangeListener { buttonView, isChecked ->
+                if (isChecked) {
+                    buttonView.setBackgroundResource(R.drawable.ic_selector_selected)
+                } else {
+                    buttonView.setBackgroundResource(R.drawable.ic_selector_default)
+                }
+            }
+            setBackgroundResource(R.drawable.ic_selector_default)
+            mPrivacyCheckBox = this
+        }
+        (((root.parent as ViewGroup).getChildAt(3) as ViewGroup).getChildAt(1) as TextView).run {
+            layoutParams = (layoutParams as ViewGroup.MarginLayoutParams).apply {
+                leftMargin = 0
+            }
+            includeFontPadding = false
+            val spans = (text as SpannableString).getSpans<ClickableSpan>(0, text.length)
+            text = getPrivacyContent(text.replace(" ".toRegex(), ""), spans)
+            val index = text.indexOfLast { it == '、' } + 1
+            mPrivacyText = text.substring(index, text.length)
+        }
+        mLoginBtn = (root.parent as ViewGroup).getChildAt(2)
+        root.bringToFront()
+    }
+
+    private fun getPrivacyContent(content: CharSequence, spans: Array<out ClickableSpan>): SpannableStringBuilder? {
+        val privacyContent = SpannableStringBuilder(content)
+        privacyContent.setSpan(object : ClickableSpan() {
+            override fun updateDrawState(ds: TextPaint) {
+                super.updateDrawState(ds)
+                spans[1].updateDrawState(ds)
+                ds.isUnderlineText = true
+            }
+
+            override fun onClick(widget: View) {
+                spans[1].onClick(widget)
+            }
+        }, 5, 11, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        privacyContent.setSpan(object : ClickableSpan() {
+            override fun updateDrawState(ds: TextPaint) {
+                super.updateDrawState(ds)
+                spans[2].updateDrawState(ds)
+                ds.isUnderlineText = true
+            }
+
+            override fun onClick(widget: View) {
+                spans[2].onClick(widget)
+            }
+        }, 12, 18, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        privacyContent.setSpan(object : ClickableSpan() {
+            override fun updateDrawState(ds: TextPaint) {
+                super.updateDrawState(ds)
+                spans[0].updateDrawState(ds)
+                ds.isUnderlineText = true
+            }
+
+            override fun onClick(widget: View) {
+                spans[0].onClick(widget)
+            }
+        }, 20, privacyContent.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        return privacyContent
+    }
     // 获取运营商名称
-    private fun getOperatorType(context: Context): String {
+    private fun getOperatorType(): String {
         mAuthnHelper?.run {
-            val jsonObject = getNetworkType(context)
+            val jsonObject = getNetworkType(HaloApp.getInstance().applicationContext)
             tryWithDefaultCatch {
-                val net = jsonObject.optString("operatorType").toInt()
-                if (net == 1) return "中国移动"
-                if (net == 2) return "中国联通"
-                if (net == 3) return "中国电信"
+                return when (jsonObject.optString("operatortype").toInt()) {
+                    1 -> "中国移动"
+                    2 -> "中国联通"
+                    3 -> "中国电信"
+                    else -> ""
+                }
             }
         }
         return ""
     }
 
-    private fun startCodeLoginPage(context: Context, isFinishAuth: Boolean) {
-        startCodeLoginPage(context, ENTRANCE_DEFAULT, isFinishAuth, false)
-    }
-
-    private fun startCodeLoginPage(context: Context, entrance: String, isFinishAuth: Boolean, isFromPermission: Boolean) {
+    // 打开验证码登录页
+    private fun startCodeLoginPage(isFinishAuth: Boolean) {
         if (mPreDialog != null && mPreDialog!!.isShowing) {
             tryWithDefaultCatch {
                 mPreDialog?.dismiss()
@@ -368,20 +409,30 @@ object QuickLoginHelper {
             finishAuthActivity()
         }
 
-        val status = when {
-            isFromPermission -> STATUS_FROM_QUICK_LOGIN_PERMISSION
+        AppManager.getInstance().recentActiveActivity.startActivity(
+            LoginActivity.getIntent(
+                AppManager.getInstance().recentActiveActivity,
+                ENTRANCE_DEFAULT,
+                mOpenAuthPageSuccess
+            )
+        )
+    }
 
-            mOpenAuthPageSuccess -> STATUS_FROM_QUICK_LOGIN_PAGE
-
-
-            else -> STATUS_DEFAULT
+    // 打开快速登录辅助页
+    private fun startQuickLoginHelperPage(loginTag: LoginTag) {
+        val intent = Intent(AppManager.getInstance().recentActiveActivity, QuickLoginHelperActivity::class.java).apply {
+            putExtra(EntranceConsts.KEY_ENTRANCE, mEntrance)
+            putExtra(EntranceConsts.KET_TYPE, loginTag)
+            if (loginTag == LoginTag.oauth) {
+                putExtra(EntranceConsts.KEY_DATA, mToken)
+            }
         }
-
-        context.startActivity(LoginActivity.getIntent(context, entrance, status))
+        AppManager.getInstance().recentActiveActivity.startActivity(intent)
     }
 
     @JvmStatic
     fun finishAuthActivity() {
+        dismissDialog()
         mAuthnHelper?.quitAuthActivity()
         // 调用quitAuthActivity()方法有概率会关不掉授权页，所以使用在调用quitAuthActivity()方法后，判断当前Activity是否还是AuthActivity，如果是则finish
         AppManager.getInstance().recentActiveActivity?.run {
@@ -389,6 +440,7 @@ object QuickLoginHelper {
                 finish()
             }
         }
+        release()
     }
 
     private fun toastCode(code: String) {
@@ -402,4 +454,22 @@ object QuickLoginHelper {
 //            toast(code)
 //        }
     }
+
+    private fun dismissDialog() {
+        if (mPreDialog != null && mPreDialog!!.isShowing) {
+            mPreDialog?.dismiss()
+        }
+        if (mLoggingDialog != null && mLoggingDialog!!.isShowing) {
+            mLoggingDialog?.dismiss()
+        }
+    }
+
+    private fun release() {
+        mAuthnHelper = null
+        mTokenListener = null
+        mPreDialog = null
+        mLoggingDialog = null
+        mPrivacyCheckBox = null
+        mLoginBtn = null
+    }
 }
\ No newline at end of file
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java
index 44a52be96d..8f0a89371f 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java
+++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java
@@ -13,7 +13,6 @@ import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.login.R;
-import com.gh.gamecenter.login.utils.QuickLoginHelper;
 
 /**
  * Created by khy on 14/08/17.
@@ -28,14 +27,14 @@ public class LoginActivity extends ToolBarActivity {
 
     @NonNull
     public static Intent getIntent(Context context, String entrance) {
-        return getIntent(context, entrance, QuickLoginHelper.STATUS_DEFAULT);
+        return getIntent(context, entrance, false);
     }
 
     @NonNull
-    public static Intent getIntent(Context context, String entrance, int status) {
+    public static Intent getIntent(Context context, String entrance, boolean isFromQuickLogin) {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
-        bundle.putInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, status);
+        bundle.putBoolean(EntranceConsts.KEY_FROM_QUICK_LOGIN, isFromQuickLogin);
         return getTargetIntent(context, LoginActivity.class, LoginFragment.class, bundle);
     }
 
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java
index 2550b0ce95..5e4dab1c88 100644
--- a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java
+++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java
@@ -1,10 +1,6 @@
 package com.gh.gamecenter.login.view;
 
-import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.text.Editable;
@@ -15,11 +11,8 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
-import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
@@ -30,6 +23,9 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.core.utils.EmptyCallback;
+import com.gh.gamecenter.login.utils.DialogUtils;
 import com.gh.gamecenter.login.utils.LoginHelper;
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment;
@@ -40,7 +36,6 @@ import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.ApiResponse;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.PackageFlavorHelper;
-import com.gh.gamecenter.common.utils.PermissionHelper;
 import com.gh.gamecenter.core.provider.IEnergyTaskProvider;
 import com.gh.gamecenter.core.provider.ILogUtilsProvider;
 import com.gh.gamecenter.core.provider.IWebProvider;
@@ -58,7 +53,6 @@ import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.login.user.UserViewModel;
 import com.gh.gamecenter.login.utils.LoginUtils;
 import com.gh.gamecenter.login.utils.QuickLoginHelper;
-import com.lightgame.utils.AppManager;
 
 import org.greenrobot.eventbus.EventBus;
 import org.jetbrains.annotations.NotNull;
@@ -88,9 +82,8 @@ public class LoginFragment
 
     private String mServiceId;
 
-    private Animation mShakeAnim;
-    private int mStatus = QuickLoginHelper.STATUS_DEFAULT;
-    private static final int THIRD_PARTY_LOGIN_CLICK_DIFF = 3000;
+    private boolean mIsFromQuickLogin = false;
+    private final int THIRD_PARTY_LOGIN_CLICK_DIFF = 3000;
 
     @Override
     protected void handleMessage(Message msg) {
@@ -137,9 +130,7 @@ public class LoginFragment
         super.onCreate(savedInstanceState);
 
         if (getArguments() != null) {
-            mStatus = getArguments().getInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, QuickLoginHelper.STATUS_DEFAULT);
-        } else {
-            mStatus = QuickLoginHelper.STATUS_DEFAULT;
+            mIsFromQuickLogin = getArguments().getBoolean(EntranceConsts.KEY_FROM_QUICK_LOGIN, false);
         }
 
         final UserViewModel.Factory factory = new UserViewModel.Factory(HaloApp.getInstance());
@@ -153,6 +144,7 @@ public class LoginFragment
                 mBinding.loginWeiboBtn,
                 mBinding.loginWechatBtn,
                 mBinding.loginCloseBtn,
+                mBinding.normalToolbarContainer.backContainer,
                 mBinding.checkIv,
                 mBinding.checkClickView1,
                 mBinding.checkClickView2,
@@ -176,32 +168,21 @@ public class LoginFragment
             mBinding.loginInviteContainer.setVisibility(View.GONE);
         }
 
-        ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mBinding.loginPhoneContainer.getLayoutParams();
-        int screenHeight;
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            screenHeight = getResources().getDisplayMetrics().heightPixels;
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            DisplayMetrics metrics = new DisplayMetrics();
-            requireActivity().getDisplay().getRealMetrics(metrics);
-            screenHeight = metrics.heightPixels;
-        } else {
-            DisplayMetrics metrics = new DisplayMetrics();
-            requireActivity().getWindowManager().getDefaultDisplay().getRealMetrics(metrics);
-            screenHeight = metrics.heightPixels;
-        }
-        params.topMargin = screenHeight * 80 / 640;
-        mBinding.loginPhoneContainer.setLayoutParams(params);
-
-        if (mStatus == QuickLoginHelper.STATUS_DEFAULT) {
-            mBinding.quickLoginTv.setVisibility(View.GONE);
-        } else {
-            mBinding.quickLoginTv.setVisibility(View.VISIBLE);
+        if (mIsFromQuickLogin) {
+            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mBinding.titleTv.getLayoutParams();
+            params.topMargin = DisplayUtils.dip2px(68F);
+            mBinding.titleTv.setLayoutParams(params);
+            mBinding.normalToolbarContainer.getRoot().setVisibility(View.VISIBLE);
+            mBinding.loginBg.setVisibility(View.GONE);
+            mBinding.policyContainerLayout.setVisibility(View.GONE);
+            mBinding.loginBottom.setVisibility(View.GONE);
         }
 
         mBinding.loginPassEt.addTextChangedListener(new LoginTextWatcher(mBinding.loginPassEt));
         mBinding.loginPhoneEt.addTextChangedListener(new LoginTextWatcher(mBinding.loginPhoneEt));
 
         mBinding.loginPrivacyPolicy.setText(getPrivacyContent());
+        mBinding.loginPrivacyPolicy.setHighlightColor(getResources().getColor(R.color.transparent));
         mBinding.loginPrivacyPolicy.setMovementMethod(new LinkMovementMethod());
     }
 
@@ -212,8 +193,8 @@ public class LoginFragment
             @Override
             public void updateDrawState(@NonNull TextPaint ds) {
                 super.updateDrawState(ds);
-                ds.setColor(getResources().getColor(R.color.theme_font));
-                ds.setUnderlineText(false);
+                ds.setColor(getResources().getColor(R.color.text_subtitle));
+                ds.setUnderlineText(true);
             }
 
             @Override
@@ -232,8 +213,8 @@ public class LoginFragment
             @Override
             public void updateDrawState(@NonNull TextPaint ds) {
                 super.updateDrawState(ds);
-                ds.setColor(getResources().getColor(R.color.theme_font));
-                ds.setUnderlineText(false);
+                ds.setColor(getResources().getColor(R.color.text_subtitle));
+                ds.setUnderlineText(true);
             }
 
             @Override
@@ -252,23 +233,17 @@ public class LoginFragment
     public void onClick(View v) {
         super.onClick(v);
         int id = v.getId();
-        if (id == R.id.quickLoginTv) {
-            if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PAGE) {
-                requireActivity().finish();
-            } else if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PERMISSION) {
-                showPermissionDialog();
-            }
-        } else if (id == R.id.checkIv || id == R.id.checkClickView1 || id == R.id.checkClickView2) {
+        if (id == R.id.checkIv || id == R.id.checkClickView1 || id == R.id.checkClickView2) {
             updatePolicyCheckedStatus();
         } else if (id == R.id.login_captcha) {
             MtaHelper.onEvent("我的光环_新", "登录页面", "获取验证码");
             final String phoneNum = mBinding.loginPhoneEt.getText().toString().trim().replaceAll(" ", "");
             if (PatternUtils.isPhoneNum(phoneNum) && phoneNum.length() == 11) {
-                if (isAgreePolicy()) {
+                checkPolicyAndContinue(() -> {
                     mBinding.loginCaptcha.setEnabled(false);
                     ExtensionsKt.showKeyBoard(mBinding.loginPassEt);
                     LoginUtils.getPhoneCaptcha(requireContext(), phoneNum, LoginFragment.this);
-                }
+                });
             } else {
                 toast("请输入正确的手机号");
             }
@@ -276,58 +251,39 @@ public class LoginFragment
             MtaHelper.onEvent("我的光环_新", "登录页面", "点击登录");
             loginByMobile();
         } else if (id == R.id.login_qq_btn) {
-            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF) && isAgreePolicy()) {
-                MtaHelper.onEvent("我的光环_新", "登录页面", "QQ登录");
-                LoginHelper.loginWithQQ(this, requireActivity());
+            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF)) {
+                checkPolicyAndContinue(() -> {
+                    MtaHelper.onEvent("我的光环_新", "登录页面", "QQ登录");
+                    LoginHelper.loginWithQQ(this, requireActivity());
+                });
             }
         } else if (id == R.id.login_weibo_btn) {
-            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF) && isAgreePolicy()) {
-                MtaHelper.onEvent("我的光环_新", "登录页面", "微博登录");
-                LoginHelper.loginWithWeibo(this, requireActivity());
+            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF)) {
+                checkPolicyAndContinue(() -> {
+                    MtaHelper.onEvent("我的光环_新", "登录页面", "微博登录");
+                    LoginHelper.loginWithWeibo(this, requireActivity());
+                });
             }
         } else if (id == R.id.login_wechat_btn) {
-            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF) && isAgreePolicy()) {
-                MtaHelper.onEvent("我的光环_新", "登录页面", "微信登录");
-                LoginHelper.loginWithWechat(this);
+            if (!ClickUtils.isFastDoubleClick(id, THIRD_PARTY_LOGIN_CLICK_DIFF)) {
+                checkPolicyAndContinue(() -> {
+                    MtaHelper.onEvent("我的光环_新", "登录页面", "微信登录");
+                    LoginHelper.loginWithWechat(this);
+                });
             }
-        } else if (id == R.id.login_close_btn) {
+        } else if (id == R.id.login_close_btn || id == R.id.backContainer) {
             requireActivity().finish();
         }
     }
 
-    private void showPermissionDialog() {
-//        if (requireContext().checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-            startQuickLogin();
-//        } else {
-//            QuickLoginHelper.showQuickLoginPermissionDialog(
-//                    requireContext(),
-//                    () -> {
-//                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(requireContext(), this::startQuickLogin);
-//                        return null;
-//                    },
-//                    () -> null
-//            );
-//        }
-    }
-
-    private void startQuickLogin() {
-        requireActivity().finish();
-        Activity currentActivity = AppManager.getInstance().getRecentActiveActivity();
-        if (currentActivity != null) {
-            QuickLoginHelper.startLogin(currentActivity, "一键登录权限弹窗");
-        }
-    }
-
-    private boolean isAgreePolicy() {
-        if (mBinding.checkIv.isChecked()) {
-            return true;
+    private void checkPolicyAndContinue(EmptyCallback callback) {
+        if (mBinding.checkIv.isChecked() || mIsFromQuickLogin) {
+            callback.onCallback();
         } else {
-            toast("请先勾选同意《用户协议》《隐私政策》");
-            if (mShakeAnim == null) {
-                mShakeAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.login_policy_shake);
-            }
-            mBinding.policyContainer.startAnimation(mShakeAnim);
-            return false;
+            DialogUtils.showLoginPolicyDialog(requireContext(), requireContext(), false, "", () -> {
+                mBinding.checkIv.setChecked(true);
+                callback.onCallback();
+            });
         }
     }
 
@@ -339,27 +295,29 @@ public class LoginFragment
         if (TextUtils.isEmpty(phoneNum)) {
             toast("手机号码不能为空");
             return;
-        } else if (!isAgreePolicy()) {
-            return;
-        } else if (TextUtils.isEmpty(code)) {
-            toast("验证码不能为空");
-            return;
-        } else if (TextUtils.isEmpty(mServiceId)) {
-            toast("验证码错误，请重新获取");
-            return;
         }
 
-        Map<String, String> params = new HashMap<>();
-        params.put("mobile", phoneNum);
-        params.put("code", code);
-        params.put("service_id", mServiceId);
+        checkPolicyAndContinue(() -> {
+            if (TextUtils.isEmpty(code)) {
+                toast("验证码不能为空");
+                return;
+            } else if (TextUtils.isEmpty(mServiceId)) {
+                toast("验证码错误，请重新获取");
+                return;
+            }
 
-        String inviteCode = mBinding.loginInviteEt.getText().toString().trim().replaceAll(" ", "");
-        if (!TextUtils.isEmpty(inviteCode)) {
-            params.put("invite_code", inviteCode);
-        }
+            Map<String, String> params = new HashMap<>();
+            params.put("mobile", phoneNum);
+            params.put("code", code);
+            params.put("service_id", mServiceId);
 
-        login(new JSONObject(params), LoginTag.phone);
+            String inviteCode = mBinding.loginInviteEt.getText().toString().trim().replaceAll(" ", "");
+            if (!TextUtils.isEmpty(inviteCode)) {
+                params.put("invite_code", inviteCode);
+            }
+
+            login(new JSONObject(params), LoginTag.phone);
+        });
     }
 
     @Override
@@ -451,7 +409,7 @@ public class LoginFragment
             if (getActivity() != null && UserManager.getInstance().isLoggedIn()) {
                 getActivity().finish();
                 // 如果是从一键登录页跳转过来的，登录成功后也要finish一键登录页
-                if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PAGE) {
+                if (mIsFromQuickLogin) {
                     QuickLoginHelper.finishAuthActivity();
                 }
             }
diff --git a/module_login/src/main/java/com/gh/gamecenter/login/view/QuickLoginHelperActivity.kt b/module_login/src/main/java/com/gh/gamecenter/login/view/QuickLoginHelperActivity.kt
new file mode 100644
index 0000000000..7debca68f3
--- /dev/null
+++ b/module_login/src/main/java/com/gh/gamecenter/login/view/QuickLoginHelperActivity.kt
@@ -0,0 +1,124 @@
+package com.gh.gamecenter.login.view
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import androidx.activity.viewModels
+import androidx.lifecycle.Observer
+import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.retrofit.ApiResponse
+import com.gh.gamecenter.core.provider.ILogUtilsProvider
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.login.HaloApp
+import com.gh.gamecenter.login.R
+import com.gh.gamecenter.login.entity.UserInfoEntity
+import com.gh.gamecenter.login.user.*
+import com.gh.gamecenter.login.utils.LoginHelper
+import com.gh.gamecenter.login.utils.QuickLoginHelper
+import org.json.JSONObject
+
+/**
+ * 快速登录辅助页，此页面为透明页面，用于执行各快速登录流程
+ */
+class QuickLoginHelperActivity : BaseActivity(), LoginHelper.LoginCallback, Observer<ApiResponse<UserInfoEntity>> {
+
+    private var mLoginDialog: WaitingDialogFragment? = null
+    private val mUserViewModel: UserViewModel by viewModels { UserViewModel.Factory(HaloApp.getInstance()) }
+
+    override fun getLayoutId() = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mUserViewModel.loginObsUserinfo.observe(this, this)
+        handleLoginType()
+    }
+
+    private fun handleLoginType() {
+        when (intent?.getSerializableExtra(EntranceConsts.KET_TYPE) as? LoginTag ?: finish()) {
+            LoginTag.qq -> LoginHelper.loginWithQQ(this, this)
+            LoginTag.wechat -> LoginHelper.loginWithWechat(this)
+            LoginTag.weibo -> LoginHelper.loginWithWeibo(this, this)
+            LoginTag.oauth -> {
+                val token = intent.getStringExtra(EntranceConsts.KEY_DATA) ?: finish()
+                login(JSONObject(mapOf("token" to token)), LoginTag.oauth)
+            }
+        }
+    }
+
+    private fun login(content: JSONObject, loginTag: LoginTag) {
+        val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as? ILogUtilsProvider
+        logUtils?.login("logging", loginTag.name, mEntrance)
+        if (loginTag != LoginTag.oauth) {
+            mLoginDialog = WaitingDialogFragment.newInstance(getString(R.string.logging))
+            mLoginDialog?.show(supportFragmentManager, null)
+        }
+        mUserViewModel.login(content, loginTag)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            // QQ Login callback
+            com.tencent.connect.common.Constants.REQUEST_LOGIN -> LoginHelper.onQQLoginCallback(requestCode, resultCode, data)
+            // WeiBo Login callback
+            32973 -> LoginHelper.onWeiboLoginCallback(this, requestCode, resultCode, data);
+        }
+    }
+
+    override fun onLoginSuccess(loginType: LoginTag, jsonContent: JSONObject) {
+        login(jsonContent, loginType);
+    }
+
+    override fun onLoginFailure(loginType: LoginTag, error: String) {
+        toast(error)
+        finish()
+    }
+
+    override fun onChanged(response: ApiResponse<UserInfoEntity>?) {
+        if (response != null && mLoginDialog != null) {
+            mLoginDialog?.dismissAllowingStateLoss()
+            mLoginDialog = null
+        }
+
+        if (response?.data != null) {
+            val loginTokenEntity = UserManager.getInstance().loginTokenEntity
+            if (loginTokenEntity != null) {
+
+                val loginType = loginTokenEntity.loginType
+                val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as? ILogUtilsProvider
+                logUtils?.login("success", loginType, mEntrance)
+
+                if (loginType == LoginTag.oauth.name) {
+                    SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false)
+                }
+
+                // 第三方登录方式登录后跳转绑定手机页面（https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1206）
+                val isThirdPartyLogin =
+                    LoginTag.qq.name == loginType || LoginTag.wechat.name == loginType || LoginTag.weibo.name == loginType || LoginTag.douyin.name == loginType
+                if (isThirdPartyLogin
+                    && TextUtils.isEmpty(response.getData().loginMobile)
+                ) {
+                    ARouter.getInstance().build(RouteConsts.activity.bindPhoneActivity)
+                        .withBoolean(EntranceConsts.KEY_FROM_LOGIN, true)
+                        .withBoolean(EntranceConsts.KEY_CHANGE_PHONE, false)
+                        .navigation()
+                }
+            }
+
+            // 防止UserManager数据丢失后重复登录
+            if (TextUtils.isEmpty(UserManager.getInstance().token)) {
+                mUserViewModel.retryCheckLogin()
+            }
+
+            finish()
+            if (UserManager.getInstance().isLoggedIn) {
+                QuickLoginHelper.finishAuthActivity()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/module_login/src/main/res/anim/cycle_interpolator.xml b/module_login/src/main/res/anim/cycle_interpolator.xml
deleted file mode 100644
index 291e39927e..0000000000
--- a/module_login/src/main/res/anim/cycle_interpolator.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:cycles="3" />
\ No newline at end of file
diff --git a/module_login/src/main/res/anim/login_policy_shake.xml b/module_login/src/main/res/anim/login_policy_shake.xml
deleted file mode 100644
index 5810c8c588..0000000000
--- a/module_login/src/main/res/anim/login_policy_shake.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="500"
-    android:fromXDelta="0"
-    android:interpolator="@anim/cycle_interpolator"
-    android:toXDelta="10" >
-</translate>
\ No newline at end of file
diff --git a/module_login/src/main/res/drawable-night-xxxhdpi/bg_mobile_login.webp b/module_login/src/main/res/drawable-night-xxxhdpi/bg_mobile_login.webp
new file mode 100644
index 0000000000..7999b3a6c5
Binary files /dev/null and b/module_login/src/main/res/drawable-night-xxxhdpi/bg_mobile_login.webp differ
diff --git a/module_login/src/main/res/drawable-night-xxxhdpi/bg_quick_login.webp b/module_login/src/main/res/drawable-night-xxxhdpi/bg_quick_login.webp
new file mode 100644
index 0000000000..f0aa933b4f
Binary files /dev/null and b/module_login/src/main/res/drawable-night-xxxhdpi/bg_quick_login.webp differ
diff --git a/module_login/src/main/res/drawable-night-xxxhdpi/ic_quick_login_change.webp b/module_login/src/main/res/drawable-night-xxxhdpi/ic_quick_login_change.webp
new file mode 100644
index 0000000000..df34338f8d
Binary files /dev/null and b/module_login/src/main/res/drawable-night-xxxhdpi/ic_quick_login_change.webp differ
diff --git a/module_login/src/main/res/drawable-night/ic_login_close.xml b/module_login/src/main/res/drawable-night/ic_login_close.xml
new file mode 100644
index 0000000000..0a23e6748b
--- /dev/null
+++ b/module_login/src/main/res/drawable-night/ic_login_close.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M5,5L19,19M5,19L19,5"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFF"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>
diff --git a/module_login/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp b/module_login/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp
deleted file mode 100644
index ab9f48020d..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_login_close.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_close.webp
deleted file mode 100644
index d38d3ffdd3..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_login_close.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_login_qq.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_qq.webp
deleted file mode 100644
index 7ef07fcf8f..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_login_qq.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_login_wechat.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_wechat.webp
deleted file mode 100644
index 8ec3108108..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_login_wechat.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_login_weibo.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_weibo.webp
deleted file mode 100644
index 1ddcadf950..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_login_weibo.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp
deleted file mode 100644
index 9b66280e1e..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp
deleted file mode 100644
index 81d7131880..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp
deleted file mode 100644
index 7bbd2dc7e0..0000000000
Binary files a/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/bg_mobile_login.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_mobile_login.webp
new file mode 100644
index 0000000000..6f83ef3a65
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/bg_mobile_login.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login.webp
new file mode 100644
index 0000000000..8119e98e84
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp
deleted file mode 100644
index cdc3fc8d71..0000000000
Binary files a/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp
deleted file mode 100644
index 5a3ad546d0..0000000000
Binary files a/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_change.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_change.webp
new file mode 100644
index 0000000000..1edfc80a41
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_change.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp
deleted file mode 100644
index f617bed08a..0000000000
Binary files a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp and /dev/null differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_qq.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_qq.webp
new file mode 100755
index 0000000000..73fcc67eed
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_qq.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_recommend.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_recommend.webp
new file mode 100644
index 0000000000..682df13642
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_recommend.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_wechat.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_wechat.webp
new file mode 100755
index 0000000000..b7343dd6f3
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_wechat.webp differ
diff --git a/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_weibo.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_weibo.webp
new file mode 100755
index 0000000000..1d9ce596f8
Binary files /dev/null and b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_weibo.webp differ
diff --git a/module_login/src/main/res/drawable/bg_login_edit.xml b/module_login/src/main/res/drawable/bg_login_edit.xml
index 4b45d3d22f..e9a7307185 100644
--- a/module_login/src/main/res/drawable/bg_login_edit.xml
+++ b/module_login/src/main/res/drawable/bg_login_edit.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/text_FAFAFA" />
+    <solid android:color="@color/background_space_2" />
 
     <corners android:radius="999dp" />
 
diff --git a/module_login/src/main/res/drawable/bg_quick_login_third_party.xml b/module_login/src/main/res/drawable/bg_quick_login_third_party.xml
new file mode 100644
index 0000000000..624df6e813
--- /dev/null
+++ b/module_login/src/main/res/drawable/bg_quick_login_third_party.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/background_white" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/divider" />
+
+</shape>
\ No newline at end of file
diff --git a/module_login/src/main/res/drawable/bg_shape_fa_radius_8.xml b/module_login/src/main/res/drawable/bg_shape_fa_radius_8.xml
deleted file mode 100644
index 6a32045836..0000000000
--- a/module_login/src/main/res/drawable/bg_shape_fa_radius_8.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="@color/text_FAFAFA" />
-</shape>
\ No newline at end of file
diff --git a/module_login/src/main/res/drawable/ic_login_close.xml b/module_login/src/main/res/drawable/ic_login_close.xml
new file mode 100644
index 0000000000..7f17d73692
--- /dev/null
+++ b/module_login/src/main/res/drawable/ic_login_close.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M5,5L19,19M5,19L19,5"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#333333"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>
diff --git a/module_login/src/main/res/drawable/icon_input_close.xml b/module_login/src/main/res/drawable/icon_input_close.xml
new file mode 100644
index 0000000000..fa1005d016
--- /dev/null
+++ b/module_login/src/main/res/drawable/icon_input_close.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M0,0h16v16h-16z"/>
+    <path
+        android:pathData="M8,16C12.418,16 16,12.418 16,8C16,3.582 12.418,0 8,0C3.582,0 0,3.582 0,8C0,12.418 3.582,16 8,16ZM6.707,5.293C6.317,4.902 5.683,4.902 5.293,5.293C4.902,5.683 4.902,6.317 5.293,6.707L6.586,8L5.293,9.293C4.902,9.683 4.902,10.317 5.293,10.707C5.683,11.098 6.317,11.098 6.707,10.707L8,9.414L9.293,10.707C9.683,11.098 10.317,11.098 10.707,10.707C11.098,10.317 11.098,9.683 10.707,9.293L9.414,8L10.707,6.707C11.098,6.317 11.098,5.683 10.707,5.293C10.317,4.902 9.683,4.902 9.293,5.293L8,6.586L6.707,5.293Z"
+        android:fillColor="@color/text_body"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/module_login/src/main/res/drawable/selector_ic_login_checkbox.xml b/module_login/src/main/res/drawable/selector_login_checkbox.xml
similarity index 53%
rename from module_login/src/main/res/drawable/selector_ic_login_checkbox.xml
rename to module_login/src/main/res/drawable/selector_login_checkbox.xml
index 3e6fed39b1..a97920d606 100644
--- a/module_login/src/main/res/drawable/selector_ic_login_checkbox.xml
+++ b/module_login/src/main/res/drawable/selector_login_checkbox.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_quick_login_check" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_quick_login_uncheck" />
-
+    <item android:drawable="@drawable/ic_selector_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_selector_default" />
 </selector>
\ No newline at end of file
diff --git a/module_login/src/main/res/layout/dialog_login_policy.xml b/module_login/src/main/res/layout/dialog_login_policy.xml
new file mode 100644
index 0000000000..a27db7e29d
--- /dev/null
+++ b/module_login/src/main/res/layout/dialog_login_policy.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/background_shape_white_radius_6">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginLeft="24dp"
+            android:includeFontPadding="false"
+            android:textSize="16sp"
+            android:textColor="@color/text_title"
+            android:text="服务协议和隐私政策等指引"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent" />
+
+        <TextView
+            android:id="@+id/content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:textSize="14sp"
+            android:textColor="@color/text_subtitle"
+            android:text="进入下一步前，请先阅读并同意光环助手的进入下一步前，请先阅读并同意光环助手的"
+            app:layout_constraintTop_toBottomOf="@+id/title"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+        <TextView
+            android:id="@+id/negativeTv"
+            android:layout_width="114dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
+            android:background="@drawable/bg_shape_f5_radius_999"
+            android:gravity="center"
+            android:textSize="14sp"
+            android:textColor="@color/text_title"
+            android:text="不同意"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/content"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <TextView
+            android:id="@+id/positiveTv"
+            android:layout_width="114dp"
+            android:layout_height="40dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
+            android:background="@drawable/button_blue_oval"
+            android:gravity="center"
+            android:textSize="14sp"
+            android:textColor="@color/text_white"
+            android:text="同意并继续"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/content"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/module_login/src/main/res/layout/dialog_quick_login.xml b/module_login/src/main/res/layout/dialog_quick_login.xml
deleted file mode 100644
index bf10b03ecd..0000000000
--- a/module_login/src/main/res/layout/dialog_quick_login.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="360dp"
-        android:layout_gravity="bottom"
-        android:background="@drawable/bg_invite_dialog">
-
-        <com.lightgame.view.imageview.RoundedImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="centerCrop"
-            android:src="@drawable/bg_quick_login_dialog"
-            app:corner_radius="12dp" />
-
-        <TextView
-            android:id="@+id/descTv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
-            android:layout_marginTop="127dp"
-            android:layout_centerHorizontal="true"
-            android:textColor="@color/text_subtitleDesc"
-            android:textSize="11sp"
-            tools:text="中国移动提供认证服务" />
-
-        <TextView
-            android:id="@+id/changeLoginBtn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="224dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:gravity="center_horizontal"
-            android:textColor="@color/text_subtitle"
-            android:textSize="14sp"
-            android:text="其他方式登录 >" />
-
-        <ImageView
-            android:id="@+id/closeIv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:padding="12dp"
-            android:src="@drawable/ic_quick_login_close" />
-    </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/module_login/src/main/res/layout/dialog_quick_login_permission.xml b/module_login/src/main/res/layout/dialog_quick_login_permission.xml
deleted file mode 100644
index 3cbce949e9..0000000000
--- a/module_login/src/main/res/layout/dialog_quick_login_permission.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="300dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/bg_shape_white_radius_8">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:src="@drawable/bg_quick_login_permission_dialog"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_marginLeft="24dp"
-            android:includeFontPadding="false"
-            android:textColor="@color/text_title"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:text="@string/quick_login_permission_dialog_title"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent" />
-
-        <TextView
-            android:id="@+id/subTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_marginLeft="24dp"
-            android:includeFontPadding="false"
-            android:textColor="@color/text_title"
-            android:textSize="13sp"
-            android:text="@string/quick_login_permission_dialog_sub_title"
-            app:layout_constraintTop_toBottomOf="@+id/title"
-            app:layout_constraintLeft_toLeftOf="parent" />
-
-        <View
-            android:id="@+id/contentBg"
-            android:layout_width="match_parent"
-            android:layout_height="76dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:background="@drawable/bg_shape_fa_radius_8"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/subTitle" />
-
-        <ImageView
-            android:id="@+id/phoneIv"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginLeft="8dp"
-            android:src="@drawable/ic_quick_login_dialog_phone"
-            app:layout_constraintTop_toTopOf="@+id/contentBg"
-            app:layout_constraintLeft_toLeftOf="@+id/contentBg" />
-
-        <TextView
-            android:id="@+id/phonePermission"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:includeFontPadding="false"
-            android:textColor="@color/text_title"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:text="@string/quick_login_permission_dialog_phone_permission"
-            app:layout_constraintTop_toTopOf="@+id/phoneIv"
-            app:layout_constraintBottom_toBottomOf="@+id/phoneIv"
-            app:layout_constraintLeft_toRightOf="@+id/phoneIv" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginRight="11dp"
-            android:includeFontPadding="false"
-            android:lineSpacingExtra="4dp"
-            android:textColor="@color/text_subtitle"
-            android:textSize="11sp"
-            android:text="@string/quick_login_permission_dialog_phone_permission_detail"
-            app:layout_constraintTop_toBottomOf="@+id/phonePermission"
-            app:layout_constraintLeft_toLeftOf="@+id/phonePermission" />
-
-        <TextView
-            android:id="@+id/confirmBtn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:gravity="center"
-            style="@style/PrimaryGradientButton"
-            android:textStyle="bold"
-            android:textSize="14sp"
-            android:text="@string/quick_login_permission_dialog_confirm"
-            app:layout_constraintTop_toBottomOf="@+id/contentBg"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
-
-        <TextView
-            android:id="@+id/cancelBtn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:gravity="center_horizontal"
-            android:textColor="@color/text_subtitle"
-            android:textSize="12sp"
-            android:text="@string/quick_login_permission_dialog_cancel"
-            app:layout_constraintTop_toBottomOf="@+id/confirmBtn"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/module_login/src/main/res/layout/fragment_login.xml b/module_login/src/main/res/layout/fragment_login.xml
index abcb244515..b3dd96c9eb 100644
--- a/module_login/src/main/res/layout/fragment_login.xml
+++ b/module_login/src/main/res/layout/fragment_login.xml
@@ -12,15 +12,52 @@
         android:id="@+id/do_not_delete_this_empty_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true"/>
+        android:fitsSystemWindows="true" />
+
+    <ImageView
+        android:id="@+id/loginBg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:src="@drawable/bg_mobile_login" />
+
+    <com.gh.gamecenter.common.view.StatusBarView
+        android:id="@+id/statusBarView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/titleTv"
+        android:layout_below="@+id/statusBarView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="145dp"
+        android:layout_marginLeft="40dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/text_title"
+        android:textSize="22sp"
+        android:text="手机号登录" />
+
+    <TextView
+        android:id="@+id/descTv"
+        android:layout_below="@+id/titleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="40dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/text_subtitleDesc"
+        android:textSize="12sp"
+        android:text="未注册手机登录后将自动创建账号" />
 
     <RelativeLayout
         android:id="@+id/login_phone_container"
         android:layout_width="match_parent"
-        android:layout_height="46dp"
-        android:layout_marginTop="80dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_height="44dp"
+        android:layout_below="@+id/descTv"
+        android:layout_marginLeft="40dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginRight="40dp"
         android:background="@drawable/bg_login_edit">
 
         <TextView
@@ -28,28 +65,37 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:text="@string/login_phone_prefix"
+            android:textColor="@color/text_subtitleDesc"
+            android:textSize="16sp" />
+
+        <View
+            android:id="@+id/phoneDivider"
+            android:layout_width="1dp"
+            android:layout_height="12dp"
+            android:layout_centerVertical="true"
             android:layout_marginLeft="16dp"
-            android:textColor="@color/text_title"
-            android:textSize="14sp"
-            android:text="@string/login_phone_prefix" />
+            android:layout_toRightOf="@+id/login_phone_prefix"
+            android:background="#EEEEEE" />
 
         <com.gh.gamecenter.common.view.ClearEditTextNormal
             android:id="@+id/login_phone_et"
-            android:layout_toRightOf="@+id/login_phone_prefix"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@+id/phoneDivider"
             android:background="@null"
             android:hint="@string/input_phone_hint"
             android:inputType="number"
             android:maxLength="13"
             android:paddingTop="10dp"
-            android:paddingBottom="10dp"
             android:paddingRight="16dp"
+            android:paddingBottom="10dp"
             android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -57,16 +103,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/login_phone_container"
-        android:layout_marginTop="12dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
         android:background="@drawable/bg_login_edit">
 
         <EditText
             android:id="@+id/login_pass_et"
             android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_marginLeft="16dp"
+            android:layout_height="44dp"
+            android:layout_marginLeft="24dp"
             android:background="@null"
             android:hint="@string/input_captcha_hint"
             android:inputType="number"
@@ -76,7 +122,7 @@
             android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/login_captcha"
@@ -84,29 +130,39 @@
             android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="16dp"
+            android:layout_marginRight="24dp"
             android:gravity="center"
             android:text="@string/login_get_captcha"
-            android:textColor="@color/text_subtitleDesc"
+            android:textColor="@color/theme_font"
             android:textSize="14sp" />
+
+        <View
+            android:id="@+id/captchaDivider"
+            android:layout_toLeftOf="@+id/login_captcha"
+            android:layout_width="1dp"
+            android:layout_height="12dp"
+            android:layout_marginRight="16dp"
+            android:layout_centerVertical="true"
+            android:background="@color/black_alpha_5" />
     </RelativeLayout>
 
     <RelativeLayout
+        tools:visibility="visible"
         android:visibility="gone"
         android:id="@+id/login_invite_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/login_password_container"
-        android:layout_marginTop="12dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
         android:background="@drawable/bg_login_edit">
 
         <EditText
             android:id="@+id/login_invite_et"
             android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_marginLeft="16dp"
+            android:layout_height="44dp"
+            android:layout_marginLeft="24dp"
             android:background="@null"
             android:hint="@string/input_invite_code_hint"
             android:paddingTop="10dp"
@@ -114,21 +170,36 @@
             android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/login_phone_btn"
+        style="@style/PrimaryGradientButton"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_below="@+id/login_invite_container"
+        android:layout_marginLeft="40dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="40dp"
+        android:alpha="0.6"
+        android:enabled="false"
+        android:gravity="center"
+        android:text="@string/login"
+        android:textSize="16sp" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/policyContainerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/login_invite_container">
+        android:layout_below="@+id/login_phone_btn">
 
         <LinearLayout
             android:id="@+id/policyContainer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="22dp"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintTop_toTopOf="parent"
@@ -137,19 +208,19 @@
 
             <com.lightgame.view.CheckableImageView
                 android:id="@+id/checkIv"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
-                android:src="@drawable/selector_ic_login_checkbox" />
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/selector_login_checkbox" />
 
             <TextView
                 android:id="@+id/login_privacy_policy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
+                android:layout_marginLeft="3dp"
                 android:includeFontPadding="false"
                 android:textColor="@color/text_subtitleDesc"
                 android:textSize="12sp"
-                tools:text="阅读并同意《用户协议》和《隐私政策》" />
+                tools:text="阅读并同意《用户协议》、《隐私政策》" />
         </LinearLayout>
 
         <View
@@ -168,21 +239,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/login_phone_btn"
-        style="@style/PrimaryGradientButton"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_below="@+id/policyContainerLayout"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="25dp"
-        android:layout_marginRight="20dp"
-        android:alpha="0.6"
-        android:enabled="false"
-        android:gravity="center"
-        android:text="@string/login"
-        android:textSize="16sp" />
-
-    <TextView
+        android:visibility="gone"
         android:id="@+id/quickLoginTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -197,47 +254,60 @@
         android:id="@+id/login_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/quickLoginTv"
-        android:layout_marginTop="40dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="64dp"
         android:gravity="center"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/login_qq_btn"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_login_qq" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_qq" />
 
         <ImageView
             android:id="@+id/login_wechat_btn"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="32dp"
-            android:src="@drawable/ic_login_wechat" />
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_wechat"
+            app:layout_constraintTop_toTopOf="@+id/qqBtn"
+            app:layout_constraintBottom_toBottomOf="@+id/qqBtn"
+            app:layout_constraintLeft_toRightOf="@+id/qqBtn"
+            app:layout_constraintRight_toLeftOf="@+id/weiboBtn" />
 
         <ImageView
             android:id="@+id/login_weibo_btn"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginLeft="32dp"
-            android:src="@drawable/ic_login_weibo" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <com.gh.gamecenter.common.view.StatusBarView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <ImageView
-            android:id="@+id/login_close_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:layout_marginLeft="2dp"
-            android:src="@drawable/ic_login_close"/>
+            android:layout_marginLeft="32dp"
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_weibo"
+            app:layout_constraintTop_toTopOf="@+id/qqBtn"
+            app:layout_constraintBottom_toBottomOf="@+id/qqBtn"
+            app:layout_constraintLeft_toRightOf="@+id/wechatBtn"
+            app:layout_constraintRight_toRightOf="parent" />
     </LinearLayout>
+
+    <ImageView
+        android:id="@+id/login_close_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/statusBarView"
+        android:padding="16dp"
+        android:src="@drawable/ic_login_close" />
+
+    <include
+        android:visibility="gone"
+        android:id="@+id/normal_toolbar_container"
+        android:layout_below="@+id/statusBarView"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        layout="@layout/reuse_toolbar" />
+
 </com.gh.gamecenter.common.view.MaterializedRelativeLayout>
\ No newline at end of file
diff --git a/module_login/src/main/res/layout/layout_quick_login.xml b/module_login/src/main/res/layout/layout_quick_login.xml
new file mode 100644
index 0000000000..1c4e24e7c7
--- /dev/null
+++ b/module_login/src/main/res/layout/layout_quick_login.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:src="@drawable/bg_quick_login" />
+
+    <com.gh.gamecenter.common.view.StatusBarView
+        android:id="@+id/statusBarView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:id="@+id/closeBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/statusBarView"
+        android:padding="12dp"
+        android:src="@drawable/ic_login_close" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="422dp"
+        android:includeFontPadding="false"
+        android:text="本机号码"
+        android:textColor="@color/text_subtitleDesc"
+        android:textSize="12sp" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="440dp"
+        android:layout_centerHorizontal="true">
+
+        <TextView
+            android:id="@+id/phonePlaceHolder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:includeFontPadding="false"
+            android:text="133****0000"
+            android:textSize="28dp"
+            android:textStyle="bold"
+            android:visibility="invisible" />
+
+        <ImageView
+            android:id="@+id/changeLoginBtn"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@+id/phonePlaceHolder"
+            android:src="@drawable/ic_quick_login_change" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/descTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="478dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/text_subtitleDesc"
+        android:textSize="12sp"
+        tools:text="中国移动提供认证服务" />
+
+    <ImageView
+        android:id="@+id/recommendIv"
+        android:layout_width="36dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="512dp"
+        android:layout_marginRight="64dp"
+        android:src="@drawable/ic_quick_login_recommend" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="692dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/qqBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_qq" />
+
+        <ImageView
+            android:id="@+id/wechatBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="32dp"
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_wechat" />
+
+        <ImageView
+            android:id="@+id/weiboBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="32dp"
+            android:padding="10dp"
+            android:background="@drawable/bg_quick_login_third_party"
+            android:src="@drawable/ic_quick_login_weibo" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/module_login/src/main/res/values/strings.xml b/module_login/src/main/res/values/strings.xml
index 61f7f303a1..3133d41bf0 100644
--- a/module_login/src/main/res/values/strings.xml
+++ b/module_login/src/main/res/values/strings.xml
@@ -13,17 +13,8 @@
     <string name="input_invite_code_hint">输入邀请码（选填）</string>
     <string name="login_phone_prefix">+86</string>
     <string name="login">登录</string>
-    <string name="quick_login">一键登录 ></string>
-    <string name="QQ">QQ</string>
-    <string name="wechat">微信</string>
-    <string name="sina_weibo">新浪微博</string>
-    <string name="other_login_hint">第三方账号快捷登录</string>
 
-    <string name="quick_login_permission_dialog_title">权限申请</string>
-    <string name="quick_login_permission_dialog_sub_title">完成一键登录，需向你申请授权以下权限：</string>
-    <string name="quick_login_permission_dialog_phone_permission">电话权限</string>
-    <string name="quick_login_permission_dialog_phone_permission_detail">识别具体运营商，方便对应运营商完成一键\n登录服务</string>
-    <string name="quick_login_permission_dialog_confirm">马上授权</string>
-    <string name="quick_login_permission_dialog_cancel">暂不授权，验证码登录</string>
+    <string name="dialog_quick_login_policy_content">进入下一步前，请先阅读并同意光环助手的<Data><![CDATA[<font color="#1383EB">《用户协议》</font>、<font color="#1383EB">《隐私政策》</font>、<font color="#1383EB">%1$s</font>]]></Data></string>
+    <string name="dialog_login_policy_content">进入下一步前，请先阅读并同意光环助手的<Data><![CDATA[<font color="#1383EB">《用户协议》</font>、<font color="#1383EB">《隐私政策》</font>]]></Data></string>
 
 </resources>
\ No newline at end of file
diff --git a/module_login/src/main/res/values/styles.xml b/module_login/src/main/res/values/styles.xml
deleted file mode 100644
index 94e2612f84..0000000000
--- a/module_login/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="quickLoginDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowBackground">@drawable/bg_invite_dialog</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowCloseOnTouchOutside">true</item>
-    </style>
-
-</resources>
\ No newline at end of file